diff --git a/.gitignore b/.gitignore index 9f7d3356..8181691c 100644 --- a/.gitignore +++ b/.gitignore @@ -27,9 +27,9 @@ out/ # Crashlytics plugin (for Android Studio and IntelliJ) com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties +crashlytics.ua.in.smartjava.properties +crashlytics-build.ua.in.smartjava.properties +fabric.ua.in.smartjava.properties ### Java template # Compiled class file *.class @@ -67,5 +67,5 @@ gradle-app.setting .gradletasknamecache # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 -# gradle/wrapper/gradle-wrapper.properties +# gradle/wrapper/gradle-wrapper.ua.in.smartjava.properties diff --git a/CHANGELOG b/CHANGELOG index 513601f7..eeca3c03 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,6 @@ 0.3.2 20171105 - - Resolves issue with tuner frequency adjustments that was causing channel processing - to lockup and show persistent 'overflow' state in each channel status + - Resolves issue with tuner frequency adjustments that was causing ua.in.smartjava.channel processing + to lockup and show persistent 'overflow' state in each ua.in.smartjava.channel status - Resolves issue with broadcastify 'mountpoint-in-use' error handling and updates memory usage logging - Resolves issue with Shoutcast 2 login error @@ -10,47 +10,47 @@ 0.3.0 20170922 - REQUIRES: Java 8 (or newer) for compatibility and eventual changeover to JavaFX - - FEATURE: audio streaming - adds capability to stream to multiple remote broadcast + - FEATURE: ua.in.smartjava.audio streaming - adds capability to stream to multiple remote broadcast servers (Broadcastify, Icecast v2.3 and v2.4+, and Shoutcast V1 and V2). Each stream can be independently configured with a delay. Audio calls are directed - to one or more streams by attaching one or more stream identifiers to each alias. - - Extensive GUI updates for tuner, channel and alias management. Includes new - 'Now Playing' channel view and 'Detail' view. - - Updated alias list management of alias id values and wildcards. Weighting is now + to one or more streams by attaching one or more stream identifiers to each ua.in.smartjava.alias. + - Extensive GUI updates for tuner, ua.in.smartjava.channel and ua.in.smartjava.alias management. Includes new + 'Now Playing' ua.in.smartjava.channel view and 'Detail' view. + - Updated ua.in.smartjava.alias list management of ua.in.smartjava.alias id values and wildcards. Weighting is now applied to each wildcard so that they can be ordered from most specific to least specific for lookup value matching purposes. - Added handling for Motorola-specific P25 patch messages and auto-generation of patch group aliases that roll-up aliases from each patched talkgroup to support - audio recording and streaming of patch calls according to the identifiers and + ua.in.smartjava.audio recording and streaming of patch calls according to the identifiers and actions defined for each of the patched talkgroups. - - Implemented bounded queues for both tuner and individual channel IQ sample + - Implemented bounded queues for both tuner and individual ua.in.smartjava.channel IQ ua.in.smartjava.sample buffers. Bounded queues have ability to enter/exit overflow state when queue size reaches overflow threshold and reset when queue size falls below the reset threshold. Channel state will show OVERFLOW in red/yellow. - Improves handling of P25 TDMA channels (NO Phase 2 decoder support yet) - - Updated airspy controller for airspy-mini specific sample rate handling. - - New developer remez filter designer tool and internal usage + - Updated airspy ua.in.smartjava.controller for airspy-mini specific ua.in.smartjava.sample rate handling. + - New developer remez ua.in.smartjava.filter designer tool and internal usage 0.2.0 20160329 - Major overhaul of underlying processing chain and extensive updates to all decoders and filters - - New audio playback interface with global mute and support for one or two - audio channels + - New ua.in.smartjava.audio playback interface with global mute and support for one or two + ua.in.smartjava.audio channels - Audio playback is prioritized using a new Call Priority name action - with selected channels having the highest priority and any audio without + with selected channels having the highest priority and any ua.in.smartjava.audio without an name identifier having the lowest priority. - Updated Audio recording per call with new 'Non-Recordable' name action - Updated Baseband (I/Q) recording at 48 kHz - Added Airspy tuner support - - New traffic channel pool manager for trunked call following - - P25 Decoder for C4FM and LSM with trunked call following and audio + - New traffic ua.in.smartjava.channel pool manager for trunked call following + - P25 Decoder for C4FM and LSM with trunked call following and ua.in.smartjava.audio decoding via the JMBE library - Updated MPT1327 decoder and trunked call following. - Updated spectral and waterfall display with zoom (2-64x) and pan and automatic - noise floor (dB) adjusted to tuner sample size + noise floor (dB) adjusted to tuner ua.in.smartjava.sample size - Resolved some issues with memory leaks and crashes -0.1.5 20150612 Added initial P25 Decoder support with integrated audio decoding +0.1.5 20150612 Added initial P25 Decoder support with integrated ua.in.smartjava.audio decoding using the JMBE library 0.1.4 20150528 Updated test P25 Decoder diff --git a/LICENSE b/LICENSE index 9cecc1d4..b0fac321 100644 --- a/LICENSE +++ b/LICENSE @@ -22,7 +22,7 @@ your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you +them if you wish), that you receive ua.in.smartjava.source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. @@ -34,7 +34,7 @@ you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they +or can get the ua.in.smartjava.source code. And you must show them these terms so they know their rights. Developers that use the GNU GPL protect your rights with two steps: @@ -111,8 +111,8 @@ menu, a prominent item in the list meets this criterion. 1. Source Code. - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source + The "ua.in.smartjava.source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-ua.in.smartjava.source form of a work. A "Standard Interface" means an interface that either is an official @@ -125,21 +125,21 @@ than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A +implementation is available to the public in ua.in.smartjava.source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable +the ua.in.smartjava.source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically +includes interface definition files associated with ua.in.smartjava.source files for +the work, and the ua.in.smartjava.source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. @@ -148,7 +148,7 @@ subprograms and other parts of the work. can regenerate automatically from other parts of the Corresponding Source. - The Corresponding Source for a work in source code form is that + The Corresponding Source for a work in ua.in.smartjava.source code form is that same work. 2. Basic Permissions. @@ -194,7 +194,7 @@ technological measures. 4. Conveying Verbatim Copies. - You may convey verbatim copies of the Program's source code as you + You may convey verbatim copies of the Program's ua.in.smartjava.source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any @@ -208,7 +208,7 @@ and you may offer support or warranty protection for a fee. 5. Conveying Modified Source Versions. You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the +produce it from the Program, in the form of ua.in.smartjava.source code under the terms of section 4, provided that you also meet all of these conditions: a) The work must carry prominent notices stating that you modified @@ -263,7 +263,7 @@ in one of these ways: product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the + conveying of ua.in.smartjava.source, or (2) access to copy the Corresponding Source from a network server at no charge. c) Convey individual copies of the object code with a copy of the @@ -290,7 +290,7 @@ in one of these ways: Source of the work are being offered to the general public at no charge under subsection 6d. - A separable portion of the object code, whose source code is excluded + A separable portion of the object code, whose ua.in.smartjava.source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. @@ -337,7 +337,7 @@ protocols for communication across the network. Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in -source code form), and must require no special password or key for +ua.in.smartjava.source code form), and must require no special password or key for unpacking, reading or copying. 7. Additional Terms. @@ -396,7 +396,7 @@ of that license document, provided that the further restriction does not survive such relicensing or conveying. If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the +must place, in the relevant ua.in.smartjava.source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. @@ -627,7 +627,7 @@ possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively +to attach them to the start of each ua.in.smartjava.source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. diff --git a/build.gradle b/build.gradle index c7576240..84d29dc9 100644 --- a/build.gradle +++ b/build.gradle @@ -6,8 +6,6 @@ buildscript { dependencies { } } -apply plugin:'application' -mainClassName = "gui.SDRTrunk" apply plugin: 'java' apply plugin: 'idea' @@ -17,6 +15,7 @@ repositories { mavenCentral() } +version = '1.0' sourceCompatibility = 1.8 sourceSets { @@ -60,12 +59,3 @@ dependencies { task wrapper(type: Wrapper) { gradleVersion = '4.3.1' } - -jar { - manifest { - attributes( - 'Class-Path': configurations.compile.collect { it.getName() }.join(' '), - 'Main-Class': 'gui.SDRTrunk' - ) - } -} \ No newline at end of file diff --git a/gradlew b/gradlew index cccdd3d5..cd2a318b 100755 --- a/gradlew +++ b/gradlew @@ -106,7 +106,7 @@ fi # For Darwin, add options to specify how the application appears in the dock if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:ua.in.smartjava.icon=$APP_HOME/media/gradle.icns\"" fi # For Cygwin, switch paths to Windows format before running java diff --git a/scripts/run_sdrtrunk_windows.bat b/scripts/run_sdrtrunk_windows.bat index 1c38bd44..39c0b465 100644 --- a/scripts/run_sdrtrunk_windows.bat +++ b/scripts/run_sdrtrunk_windows.bat @@ -13,10 +13,10 @@ for /f "usebackq tokens=3" %%a in (`java -version 2^>^&1 ^| find "version"`) do if !c! equ 9 ( echo Using Java 9 options - java -cp "SDRTrunk.jar;*;libs/*;config/*;images/*" --add-modules java.xml.bind gui.SDRTrunk + java -cp "SDRTrunk.jar;*;libs/*;config/*;images/*" --add-modules java.xml.bind ua.in.smartjava.gui.SDRTrunk ) else ( echo Using Java 8 options - java -XX:+UseG1GC -cp "SDRTrunk.jar;*;libs/*;config/*;images/*" gui.SDRTrunk + java -XX:+UseG1GC -cp "SDRTrunk.jar;*;libs/*;config/*;images/*" ua.in.smartjava.gui.SDRTrunk ) ) diff --git a/src/main/java/audio/squelch/SquelchMode.java b/src/main/java/audio/squelch/SquelchMode.java deleted file mode 100644 index d5f09b9d..00000000 --- a/src/main/java/audio/squelch/SquelchMode.java +++ /dev/null @@ -1,25 +0,0 @@ -package audio.squelch; - -/** - * Squelch state for a decoding channel. The state determines the handling of - * any audio packets processed by the channel state. - */ -public enum SquelchMode -{ - /** - * Automatic: decoded message activity dictates squelch state and determines - * if audio is passed - */ - AUTOMATIC, - - /** - * Manually applied squelch noise level threshold determines if audio is - * passed. - */ - MANUAL, - - /** - * No Squelch - no squelch is applied and all audio is passed - */ - NONE; -} diff --git a/src/main/java/filter/IFilter.java b/src/main/java/filter/IFilter.java deleted file mode 100644 index fbb7226f..00000000 --- a/src/main/java/filter/IFilter.java +++ /dev/null @@ -1,36 +0,0 @@ -package filter; - -public interface IFilter -{ - /** - * Generic filter method. - * - * @param message - message to filter - * @return - true if the message passes the filter - */ - public boolean passes( T t ); - - /** - * Indicates if the filter can process (filter) the object - * - * @param message - candidate message for filtering - * - * @return - true if the filter is capable of filtering the message - */ - public boolean canProcess( T t ); - - /** - * Indicates if this filter is enabled to evaluate messages - */ - public boolean isEnabled(); - - /** - * Sets the enabled state of the filter - */ - public void setEnabled( boolean enabled ); - - /** - * Display name for the filter - */ - public String getName(); -} diff --git a/src/main/java/module/decode/p25/C4FMFrameListener.java b/src/main/java/module/decode/p25/C4FMFrameListener.java deleted file mode 100644 index befb0468..00000000 --- a/src/main/java/module/decode/p25/C4FMFrameListener.java +++ /dev/null @@ -1,15 +0,0 @@ -package module.decode.p25; - -import bits.BinaryMessage; - -public interface C4FMFrameListener -{ - /** - * Listener interface to receive the output of the C4FMMessageFramer. - * - * @param buffer - framed message without the sync pattern - * @param inverted - flag indicating if the message was received inverted - */ - public void receive( BinaryMessage buffer, boolean inverted ); - -} diff --git a/src/main/java/network.java b/src/main/java/network.java deleted file mode 100644 index b7a93210..00000000 --- a/src/main/java/network.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * sdrtrunk - * Copyright (C) 2014-2016 Dennis Sheirer - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see - * - ******************************************************************************/ -public class network -{ -} diff --git a/src/main/java/org/jdesktop/beans/AbstractBean.java b/src/main/java/org/jdesktop/beans/AbstractBean.java index 931e94b3..e0060a55 100644 --- a/src/main/java/org/jdesktop/beans/AbstractBean.java +++ b/src/main/java/org/jdesktop/beans/AbstractBean.java @@ -37,7 +37,7 @@ import java.beans.VetoableChangeSupport; * *

* A non-visual java bean is a Java class that conforms to the AbstractBean - * patterns to allow visual manipulation of the bean's properties and event + * patterns to allow visual manipulation of the bean's ua.in.smartjava.properties and event * handlers at design-time. *

* @@ -178,7 +178,7 @@ public abstract class AbstractBean { /** * Add a PropertyChangeListener to the listener list. - * The listener is registered for all properties. + * The listener is registered for all ua.in.smartjava.properties. * The same listener object may be added more than once, and will be called * as many times as it is added. * If listener is null, no exception is thrown and no action @@ -193,9 +193,9 @@ public abstract class AbstractBean { /** * Remove a PropertyChangeListener from the listener list. * This removes a PropertyChangeListener that was registered - * for all properties. + * for all ua.in.smartjava.properties. * If listener was added more than once to the same event - * source, it will be notified one less time after being removed. + * ua.in.smartjava.source, it will be notified one less time after being removed. * If listener is null, or was never added, no exception is * thrown and no action is taken. * @@ -259,7 +259,7 @@ public abstract class AbstractBean { /** * Remove a PropertyChangeListener for a specific property. * If listener was added more than once to the same event - * source for the specified property, it will be notified one less time + * ua.in.smartjava.source for the specified property, it will be notified one less time * after being removed. * If propertyName is null, no exception is thrown and no * action is taken. @@ -340,8 +340,8 @@ public abstract class AbstractBean { /** * Check if there are any listeners for a specific property, including - * those registered on all properties. If propertyName - * is null, only check for listeners registered on all properties. + * those registered on all ua.in.smartjava.properties. If propertyName + * is null, only check for listeners registered on all ua.in.smartjava.properties. * * @param propertyName the property name. * @return true if there are one or more listeners for the given property @@ -352,8 +352,8 @@ public abstract class AbstractBean { /** * Check if there are any listeners for a specific property, including - * those registered on all properties. If propertyName - * is null, only check for listeners registered on all properties. + * those registered on all ua.in.smartjava.properties. If propertyName + * is null, only check for listeners registered on all ua.in.smartjava.properties. * * @param propertyName the property name. * @return true if there are one or more listeners for the given property @@ -364,7 +364,7 @@ public abstract class AbstractBean { /** * Add a VetoableListener to the listener list. - * The listener is registered for all properties. + * The listener is registered for all ua.in.smartjava.properties. * The same listener object may be added more than once, and will be called * as many times as it is added. * If listener is null, no exception is thrown and no action @@ -380,9 +380,9 @@ public abstract class AbstractBean { /** * Remove a VetoableChangeListener from the listener list. * This removes a VetoableChangeListener that was registered - * for all properties. + * for all ua.in.smartjava.properties. * If listener was added more than once to the same event - * source, it will be notified one less time after being removed. + * ua.in.smartjava.source, it will be notified one less time after being removed. * If listener is null, or was never added, no exception is * thrown and no action is taken. * @@ -425,7 +425,7 @@ public abstract class AbstractBean { /** * Remove a VetoableChangeListener for a specific property. * If listener was added more than once to the same event - * source for the specified property, it will be notified one less time + * ua.in.smartjava.source for the specified property, it will be notified one less time * after being removed. * If propertyName is null, no exception is thrown and no * action is taken. diff --git a/src/main/java/org/jdesktop/swingx/JXMapKit.form b/src/main/java/org/jdesktop/swingx/JXMapKit.form index 59423d37..d30eaa74 100644 --- a/src/main/java/org/jdesktop/swingx/JXMapKit.form +++ b/src/main/java/org/jdesktop/swingx/JXMapKit.form @@ -61,7 +61,7 @@ - + @@ -92,7 +92,7 @@ - + diff --git a/src/main/java/org/jdesktop/swingx/JXMapKit.java b/src/main/java/org/jdesktop/swingx/JXMapKit.java index 6fecf5d3..204b8ef5 100644 --- a/src/main/java/org/jdesktop/swingx/JXMapKit.java +++ b/src/main/java/org/jdesktop/swingx/JXMapKit.java @@ -42,7 +42,7 @@ import org.jdesktop.swingx.painter.Painter; /** *

The JXMapKit is a pair of JXMapViewers preconfigured to be easy to use * with common features built in. This includes zoom buttons, a zoom slider, - * and a mini-map in the lower right corner showing an overview of the map. + * and a mini-ua.in.smartjava.map in the lower right corner showing an overview of the ua.in.smartjava.map. * Each feature can be turned off using an appropriate * isXvisible property. For example, to turn * off the minimap call @@ -112,7 +112,7 @@ public class JXMapKit extends JPanel rebuildMainMapOverlay(); /* - * // adapter to move the minimap after the main map has moved MouseInputAdapter ma = new MouseInputAdapter() { + * // adapter to move the minimap after the main ua.in.smartjava.map has moved MouseInputAdapter ma = new MouseInputAdapter() { * public void mouseReleased(MouseEvent e) { miniMap.setCenterPosition(mapCenterPosition); } }; * mainMap.addMouseMotionListener(ma); mainMap.addMouseListener(ma); */ @@ -152,13 +152,13 @@ public class JXMapKit extends JPanel } }); - // an overlay for the mini-map which shows a rectangle representing the main map + // an overlay for the mini-ua.in.smartjava.map which shows a rectangle representing the main ua.in.smartjava.map miniMap.setOverlayPainter(new Painter() { @Override public void paint(Graphics2D g, JXMapViewer map, int width, int height) { - // get the viewport rect of the main map + // get the viewport rect of the main ua.in.smartjava.map Rectangle mainMapBounds = mainMap.getViewportBounds(); // convert to Point2Ds @@ -170,7 +170,7 @@ public class JXMapKit extends JPanel GeoPosition upperLeft = mainMap.getTileFactory().pixelToGeo(upperLeft2D, mainMap.getZoom()); GeoPosition lowerRight = mainMap.getTileFactory().pixelToGeo(lowerRight2D, mainMap.getZoom()); - // convert to Point2Ds on the mini-map + // convert to Point2Ds on the mini-ua.in.smartjava.map upperLeft2D = map.getTileFactory().geoToPixel(upperLeft, map.getZoom()); lowerRight2D = map.getTileFactory().geoToPixel(lowerRight, map.getZoom()); @@ -178,7 +178,7 @@ public class JXMapKit extends JPanel Rectangle rect = map.getViewportBounds(); // p("rect = " + rect); g.translate(-rect.x, -rect.y); -// Point2D centerpos = map.getTileFactory().geoToPixel(mapCenterPosition, map.getZoom()); +// Point2D centerpos = ua.in.smartjava.map.getTileFactory().geoToPixel(mapCenterPosition, ua.in.smartjava.map.getZoom()); // p("center pos = " + centerpos); g.setPaint(Color.RED); // g.drawRect((int)centerpos.getX()-30,(int)centerpos.getY()-30,60,60); @@ -210,7 +210,7 @@ public class JXMapKit extends JPanel private boolean zoomChanging = false; /** - * Set the current zoomlevel for the main map. The minimap will be updated accordingly + * Set the current zoomlevel for the main ua.in.smartjava.map. The minimap will be updated accordingly * @param zoom the new zoom level */ public void setZoom(int zoom) @@ -230,7 +230,7 @@ public class JXMapKit extends JPanel } /** - * Returns an action which can be attached to buttons or menu items to make the map zoom out + * Returns an action which can be attached to buttons or menu items to make the ua.in.smartjava.map zoom out * @return a preconfigured Zoom Out action */ public Action getZoomOutAction() @@ -253,7 +253,7 @@ public class JXMapKit extends JPanel } /** - * Returns an action which can be attached to buttons or menu items to make the map zoom in + * Returns an action which can be attached to buttons or menu items to make the ua.in.smartjava.map zoom in * @return a preconfigured Zoom In action */ public Action getZoomInAction() @@ -417,8 +417,8 @@ public class JXMapKit extends JPanel // End of variables declaration//GEN-END:variables /** - * Indicates if the mini-map is currently visible - * @return the current value of the mini-map property + * Indicates if the mini-ua.in.smartjava.map is currently visible + * @return the current value of the mini-ua.in.smartjava.map property */ public boolean isMiniMapVisible() { @@ -426,7 +426,7 @@ public class JXMapKit extends JPanel } /** - * Sets if the mini-map should be visible + * Sets if the mini-ua.in.smartjava.map should be visible * @param miniMapVisible a new value for the miniMap property */ public void setMiniMapVisible(boolean miniMapVisible) @@ -534,7 +534,7 @@ public class JXMapKit extends JPanel /** * Returns a reference to the main embedded JXMapViewer component - * @return the main map + * @return the main ua.in.smartjava.map */ public JXMapViewer getMainMap() { diff --git a/src/main/java/org/jdesktop/swingx/JXMapViewer.java b/src/main/java/org/jdesktop/swingx/JXMapViewer.java index d1697a0e..bb01542d 100644 --- a/src/main/java/org/jdesktop/swingx/JXMapViewer.java +++ b/src/main/java/org/jdesktop/swingx/JXMapViewer.java @@ -39,24 +39,24 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * A tile oriented map component that can easily be used with tile sources + * A tile oriented ua.in.smartjava.map component that can easily be used with tile sources * on the web like Google and Yahoo maps, satellite data such as NASA imagery, * and also with file based sources like pre-processed NASA images. - * A known map provider can be used with the SLMapServerInfo, + * A known ua.in.smartjava.map provider can be used with the SLMapServerInfo, * which will connect to a 2km resolution version of NASA's Blue Marble Next Generation * imagery. @see SLMapServerInfo for more information. * - * Note, the JXMapViewer has three center point properties. The addressLocation property - * represents an abstract center of the map. This would usually be something like the first item + * Note, the JXMapViewer has three center point ua.in.smartjava.properties. The addressLocation property + * represents an abstract center of the ua.in.smartjava.map. This would usually be something like the first item * in a search result. It is a {@link GeoPosition}. The centerPosition property represents - * the current center point of the map. If the user pans the map then the centerPosition point will - * change but the addressLocation will not. Calling recenterToAddressLocation() will move the map + * the current center point of the ua.in.smartjava.map. If the user pans the ua.in.smartjava.map then the centerPosition point will + * change but the addressLocation will not. Calling recenterToAddressLocation() will move the ua.in.smartjava.map * back to that center address. The center property represents the same point as the centerPosition * property, but as a Point2D in pixel space instead of a GeoPosition in lat/long space. Note that - * the center property is a Point2D in the entire world bitmap, not in the portion of the map currently - * visible. You can use the getViewportBounds() method to find the portion of the map currently visible + * the center property is a Point2D in the entire world bitmap, not in the portion of the ua.in.smartjava.map currently + * visible. You can use the getViewportBounds() method to find the portion of the ua.in.smartjava.map currently visible * and adjust your calculations accordingly. Changing the center property will change the centerPosition - * property and vice versa. All three properties are bound. + * property and vice versa. All three ua.in.smartjava.properties are bound. * @author Joshua.Marinacci@sun.com * @see org.jdesktop.swingx.mapviewer.bmng.SLMapServerInfo */ @@ -76,9 +76,9 @@ public class JXMapViewer extends JPanel implements DesignMode private int zoomLevel = 1; /** - * The position, in map coordinates of the center point. This is defined as the distance from the top and - * left edges of the map in pixels. Dragging the map component will change the center position. Zooming in/out will - * cause the center to be recalculated so as to remain in the center of the new "map". + * The position, in ua.in.smartjava.map coordinates of the center point. This is defined as the distance from the top and + * left edges of the ua.in.smartjava.map in pixels. Dragging the ua.in.smartjava.map component will change the center position. Zooming in/out will + * cause the center to be recalculated so as to remain in the center of the new "ua.in.smartjava.map". */ private Point2D center = new Point2D.Double(0, 0); @@ -89,20 +89,20 @@ public class JXMapViewer extends JPanel implements DesignMode private boolean drawTileBorders = false; /** - * Factory used by this component to grab the tiles necessary for painting the map. + * Factory used by this component to grab the tiles necessary for painting the ua.in.smartjava.map. */ private TileFactory factory; /** * The position in latitude/longitude of the "address" being mapped. This is a special coordinate that, when moved, - * will cause the map to be moved as well. It is separate from "center" in that "center" tracks the current center + * will cause the ua.in.smartjava.map to be moved as well. It is separate from "center" in that "center" tracks the current center * (in pixels) of the viewport whereas this will not change when panning or zooming. Whenever the addressLocation is - * changed, however, the map will be repositioned. + * changed, however, the ua.in.smartjava.map will be repositioned. */ private GeoPosition addressLocation; /** - * The overlay to delegate to for painting the "foreground" of the map component. This would include painting + * The overlay to delegate to for painting the "foreground" of the ua.in.smartjava.map component. This would include painting * waypoints, day/night, etc. Also receives mouse events. */ private Painter overlay; @@ -194,7 +194,7 @@ public class JXMapViewer extends JPanel implements DesignMode } /** - * Draw the map tiles. This method is for implementation use only. + * Draw the ua.in.smartjava.map tiles. This method is for implementation use only. * @param g Graphics * @param zoom zoom level to draw at * @param viewportBounds the bounds to draw within @@ -233,7 +233,7 @@ public class JXMapViewer extends JPanel implements DesignMode int ox = ((itpx * getTileFactory().getTileSize(zoom)) - viewportBounds.x); int oy = ((itpy * getTileFactory().getTileSize(zoom)) - viewportBounds.y); - // if the tile is off the map to the north/south, then just don't paint anything + // if the tile is off the ua.in.smartjava.map to the north/south, then just don't paint anything if (isTileOnMap(itpx, itpy, mapSize)) { if (isOpaque()) @@ -303,9 +303,9 @@ public class JXMapViewer extends JPanel implements DesignMode } /** - * Sets the map overlay. This is a Painter which will paint on top of the map. It can be used to draw waypoints, + * Sets the ua.in.smartjava.map overlay. This is a Painter which will paint on top of the ua.in.smartjava.map. It can be used to draw waypoints, * lines, or static overlays like text messages. - * @param overlay the map overlay to use + * @param overlay the ua.in.smartjava.map overlay to use */ public void setOverlayPainter(Painter overlay) { @@ -341,8 +341,8 @@ public class JXMapViewer extends JPanel implements DesignMode } /** - * Gets the current map overlay - * @return the current map overlay + * Gets the current ua.in.smartjava.map overlay + * @return the current ua.in.smartjava.map overlay */ public Painter getOverlayPainter() { @@ -352,7 +352,7 @@ public class JXMapViewer extends JPanel implements DesignMode /** * Returns the bounds of the viewport in pixels. This can be used to transform points into the world bitmap * coordinate space. - * @return the bounds in pixels of the "view" of this map + * @return the bounds in pixels of the "view" of this ua.in.smartjava.map */ public Rectangle getViewportBounds() { @@ -413,9 +413,9 @@ public class JXMapViewer extends JPanel implements DesignMode } /** - * Gets the current address location of the map. This property does not change when the user pans the map. This + * Gets the current address location of the ua.in.smartjava.map. This property does not change when the user pans the ua.in.smartjava.map. This * property is bound. - * @return the current map location (address) + * @return the current ua.in.smartjava.map location (address) */ public GeoPosition getAddressLocation() { @@ -423,7 +423,7 @@ public class JXMapViewer extends JPanel implements DesignMode } /** - * Gets the current address location of the map + * Gets the current address location of the ua.in.smartjava.map * @param addressLocation the new address location */ public void setAddressLocation(GeoPosition addressLocation) @@ -437,7 +437,7 @@ public class JXMapViewer extends JPanel implements DesignMode } /** - * Re-centers the map to have the current address location be at the center of the map, accounting for the map's + * Re-centers the ua.in.smartjava.map to have the current address location be at the center of the ua.in.smartjava.map, accounting for the ua.in.smartjava.map's * width and height. */ public void recenterToAddressLocation() @@ -468,7 +468,7 @@ public class JXMapViewer extends JPanel implements DesignMode } /** - * A property indicating the center position of the map + * A property indicating the center position of the ua.in.smartjava.map * @param geoPosition the new property value */ public void setCenterPosition(GeoPosition geoPosition) @@ -481,7 +481,7 @@ public class JXMapViewer extends JPanel implements DesignMode } /** - * A property indicating the center position of the map + * A property indicating the center position of the ua.in.smartjava.map * @return the current center position */ public GeoPosition getCenterPosition() @@ -537,8 +537,8 @@ public class JXMapViewer extends JPanel implements DesignMode } /** - * Gets the current pixel center of the map. This point is in the global bitmap coordinate system, not as lat/longs. - * @return the current center of the map as a pixel value + * Gets the current pixel center of the ua.in.smartjava.map. This point is in the global bitmap coordinate system, not as lat/longs. + * @return the current center of the ua.in.smartjava.map as a pixel value */ public Point2D getCenter() { @@ -546,8 +546,8 @@ public class JXMapViewer extends JPanel implements DesignMode } /** - * Sets the new center of the map in pixel coordinates. - * @param center the new center of the map in pixel coordinates + * Sets the new center of the ua.in.smartjava.map in pixel coordinates. + * @param center the new center of the ua.in.smartjava.map in pixel coordinates */ public void setCenter(Point2D center) { @@ -591,13 +591,13 @@ public class JXMapViewer extends JPanel implements DesignMode centerX = mapWidth - viewportWidth / 2; } - // if map is to small then just center it vert + // if ua.in.smartjava.map is to small then just center it vert if (mapHeight < newVP.getHeight()) { centerY = mapHeight / 2;// viewportHeight/2;// - mapHeight/2; } - // if map is too small then just center it horiz + // if ua.in.smartjava.map is too small then just center it horiz if (!isHorizontalWrapped() && mapWidth < newVP.getWidth()) { centerX = mapWidth / 2; @@ -641,7 +641,7 @@ public class JXMapViewer extends JPanel implements DesignMode int zoom = getZoom(); Rectangle2D rect = generateBoundingRect(positions, zoom); - // Rectangle2D viewport = map.getViewportBounds(); + // Rectangle2D viewport = ua.in.smartjava.map.getViewportBounds(); int count = 0; while (!getViewportBounds().contains(rect)) { @@ -745,9 +745,9 @@ public class JXMapViewer extends JPanel implements DesignMode /** * Converts the specified GeoPosition to a point in the JXMapViewer's local coordinate space. This method is - * especially useful when drawing lat/long positions on the map. - * @param pos a GeoPosition on the map - * @return the point in the local coordinate space of the map + * especially useful when drawing lat/long positions on the ua.in.smartjava.map. + * @param pos a GeoPosition on the ua.in.smartjava.map + * @return the point in the local coordinate space of the ua.in.smartjava.map */ public Point2D convertGeoPositionToPoint(GeoPosition pos) { @@ -759,9 +759,9 @@ public class JXMapViewer extends JPanel implements DesignMode } /** - * Converts the specified Point2D in the JXMapViewer's local coordinate space to a GeoPosition on the map. This + * Converts the specified Point2D in the JXMapViewer's local coordinate space to a GeoPosition on the ua.in.smartjava.map. This * method is especially useful for determining the GeoPosition under the mouse cursor. - * @param pt a point in the local coordinate space of the map + * @param pt a point in the local coordinate space of the ua.in.smartjava.map * @return the point converted to a GeoPosition */ public GeoPosition convertPointToGeoPosition(Point2D pt) diff --git a/src/main/java/org/jdesktop/swingx/OSMTileFactoryInfo.java b/src/main/java/org/jdesktop/swingx/OSMTileFactoryInfo.java index 4c0510d3..1f7474ac 100644 --- a/src/main/java/org/jdesktop/swingx/OSMTileFactoryInfo.java +++ b/src/main/java/org/jdesktop/swingx/OSMTileFactoryInfo.java @@ -20,7 +20,7 @@ // // Copyright (c) Fraunhofer IGD. All rights reserved. // -// This source code is property of the Fraunhofer IGD and underlies +// This ua.in.smartjava.source code is property of the Fraunhofer IGD and underlies // copyright restrictions. It may only be used with explicit // permission from the respective owner. diff --git a/src/main/java/org/jdesktop/swingx/VirtualEarthTileFactoryInfo.java b/src/main/java/org/jdesktop/swingx/VirtualEarthTileFactoryInfo.java index d9784011..d22c6836 100644 --- a/src/main/java/org/jdesktop/swingx/VirtualEarthTileFactoryInfo.java +++ b/src/main/java/org/jdesktop/swingx/VirtualEarthTileFactoryInfo.java @@ -28,22 +28,22 @@ import org.jdesktop.swingx.mapviewer.TileFactoryInfo; public class VirtualEarthTileFactoryInfo extends TileFactoryInfo { /** - * Use road map + * Use road ua.in.smartjava.map */ - public final static MVEMode MAP = new MVEMode("map", "map", "r", ".png"); + public final static MVEMode MAP = new MVEMode("ua/in/smartjava/map", "ua/in/smartjava/map", "r", ".png"); /** - * Use satellite map + * Use satellite ua.in.smartjava.map */ public final static MVEMode SATELLITE = new MVEMode("satellite", "satellite", "a", ".jpeg"); /** - * Use hybrid map + * Use hybrid ua.in.smartjava.map */ public final static MVEMode HYBRID = new MVEMode("hybrid", "hybrid", "h", ".jpeg"); /** - * The map mode + * The ua.in.smartjava.map mode */ public static class MVEMode { diff --git a/src/main/java/org/jdesktop/swingx/input/CenterMapListener.java b/src/main/java/org/jdesktop/swingx/input/CenterMapListener.java index 34eb7fa1..dbec6044 100644 --- a/src/main/java/org/jdesktop/swingx/input/CenterMapListener.java +++ b/src/main/java/org/jdesktop/swingx/input/CenterMapListener.java @@ -27,7 +27,7 @@ import javax.swing.SwingUtilities; import org.jdesktop.swingx.JXMapViewer; /** - * Centers the map on the mouse cursor + * Centers the ua.in.smartjava.map on the mouse cursor * if left is double-clicked or middle mouse * button is pressed. * @author Martin Steiger diff --git a/src/main/java/org/jdesktop/swingx/mapviewer/AbstractTileFactory.java b/src/main/java/org/jdesktop/swingx/mapviewer/AbstractTileFactory.java index 2fe001f9..6268937e 100644 --- a/src/main/java/org/jdesktop/swingx/mapviewer/AbstractTileFactory.java +++ b/src/main/java/org/jdesktop/swingx/mapviewer/AbstractTileFactory.java @@ -65,7 +65,7 @@ public abstract class AbstractTileFactory extends TileFactory private int threadPoolSize = 4; private ExecutorService service; - // TODO the tile map should be static ALWAYS, regardless of the number + // TODO the tile ua.in.smartjava.map should be static ALWAYS, regardless of the number // of GoogleTileFactories because each tile is, really, a singleton. private Map tileMap = new HashMap(); @@ -123,7 +123,7 @@ public abstract class AbstractTileFactory extends TileFactory else { tile = tileMap.get(url); - // if its in the map but is low and isn't loaded yet + // if its in the ua.in.smartjava.map but is low and isn't loaded yet // but we are in high mode if (tile.getPriority() == Tile.Priority.Low && eagerLoad && !tile.isLoaded()) { @@ -208,7 +208,7 @@ public abstract class AbstractTileFactory extends TileFactory @Override public Thread newThread(Runnable r) { - Thread t = new Thread(r, "map tile fetcher-pool-" + count++); + Thread t = new Thread(r, "ua.in.smartjava.map tile fetcher-pool-" + count++); t.setPriority(Thread.MIN_PRIORITY); t.setDaemon(true); return t; diff --git a/src/main/java/org/jdesktop/swingx/mapviewer/TileFactory.java b/src/main/java/org/jdesktop/swingx/mapviewer/TileFactory.java index c3ebb5c7..d5218334 100644 --- a/src/main/java/org/jdesktop/swingx/mapviewer/TileFactory.java +++ b/src/main/java/org/jdesktop/swingx/mapviewer/TileFactory.java @@ -45,9 +45,9 @@ public abstract class TileFactory } /** - * Returns a Dimension containing the width and height of the map, in tiles at the current zoom level. So a + * Returns a Dimension containing the width and height of the ua.in.smartjava.map, in tiles at the current zoom level. So a * Dimension that returns 10x20 would be 10 tiles wide and 20 tiles tall. These values can be multipled by - * getTileSize() to determine the pixel width/height for the map at the given zoom level + * getTileSize() to determine the pixel width/height for the ua.in.smartjava.map at the given zoom level * @return the size of the world bitmap in tiles * @param zoom the current zoom level */ @@ -61,7 +61,7 @@ public abstract class TileFactory * @return the tile that is located at the given tilePoint for this zoom level. For example, if getMapSize() returns * 10x20 for this zoom, and the tilePoint is (3,5), then the appropriate tile will be located and returned. This * method must not return null. However, it can return dummy tiles that contain no data if it wants. This is - * appropriate, for example, for tiles which are outside of the bounds of the map and if the factory doesn't + * appropriate, for example, for tiles which are outside of the bounds of the ua.in.smartjava.map and if the factory doesn't * implement wrapping. * @param x the x value * @param y the y value diff --git a/src/main/java/org/jdesktop/swingx/mapviewer/TileFactoryInfo.java b/src/main/java/org/jdesktop/swingx/mapviewer/TileFactoryInfo.java index 3fb97564..36df3fa4 100644 --- a/src/main/java/org/jdesktop/swingx/mapviewer/TileFactoryInfo.java +++ b/src/main/java/org/jdesktop/swingx/mapviewer/TileFactoryInfo.java @@ -12,8 +12,8 @@ package org.jdesktop.swingx.mapviewer; import java.awt.geom.Point2D; /** - * A TileFactoryInfo encapsulates all information specific to a map server. This includes everything from the url to - * load the map tiles from to the size and depth of the tiles. Theoretically any map server can be used by installing a + * A TileFactoryInfo encapsulates all information specific to a ua.in.smartjava.map server. This includes everything from the url to + * load the ua.in.smartjava.map tiles from to the size and depth of the tiles. Theoretically any ua.in.smartjava.map server can be used by installing a * customized TileFactoryInfo. Currently * @author joshy */ @@ -30,7 +30,7 @@ public class TileFactoryInfo */ private int[] mapWidthInTilesAtZoom; /** - * An array of coordinates in pixels that indicates the center in the world map for the given zoom level. + * An array of coordinates in pixels that indicates the center in the world ua.in.smartjava.map for the given zoom level. */ private Point2D[] mapCenterInPixelsAtZoom;// = new Point2D.Double[18]; @@ -62,7 +62,7 @@ public class TileFactoryInfo /** * Creates a new instance of TileFactoryInfo. Note that TileFactoryInfo should be considered invariate, meaning that - * subclasses should ensure all of the properties stay the same after the class is constructed. Returning different + * subclasses should ensure all of the ua.in.smartjava.properties stay the same after the class is constructed. Returning different * values of getTileSize() for example is considered an error and may result in unexpected behavior. * @param minimumZoomLevel The minimum zoom level * @param maximumZoomLevel the maximum zoom level @@ -76,7 +76,7 @@ public class TileFactoryInfo * @param zparam the z parameter for the tile url */ /* - * @param xr2l true if tile x is measured from the far left of the map to the far right, or else false if based on + * @param xr2l true if tile x is measured from the far left of the ua.in.smartjava.map to the far right, or else false if based on * the center line. * @param yt2b true if tile y is measured from the top (north pole) to the bottom (south pole) or else false if * based on the equator. @@ -90,7 +90,7 @@ public class TileFactoryInfo /** * Creates a new instance of TileFactoryInfo. Note that TileFactoryInfo should be considered invariate, meaning that - * subclasses should ensure all of the properties stay the same after the class is constructed. Returning different + * subclasses should ensure all of the ua.in.smartjava.properties stay the same after the class is constructed. Returning different * values of getTileSize() for example is considered an error and may result in unexpected behavior. * @param name A name to identify this information. * @param minimumZoomLevel The minimum zoom level @@ -105,7 +105,7 @@ public class TileFactoryInfo * @param zparam the z parameter for the tile url */ /* - * @param xr2l true if tile x is measured from the far left of the map to the far right, or else false if based on + * @param xr2l true if tile x is measured from the far left of the ua.in.smartjava.map to the far right, or else false if based on * the center line. * @param yt2b true if tile y is measured from the top (north pole) to the bottom (south pole) or else false if * based on the equator. @@ -170,7 +170,7 @@ public class TileFactoryInfo } /** - * @return the total map zoom level + * @return the total ua.in.smartjava.map zoom level */ public int getTotalMapZoom() { @@ -179,7 +179,7 @@ public class TileFactoryInfo /** * @param zoom the zoom level - * @return the map width in tiles + * @return the ua.in.smartjava.map width in tiles */ public int getMapWidthInTilesAtZoom(int zoom) { @@ -188,7 +188,7 @@ public class TileFactoryInfo /** * @param zoom the zoom level - * @return the map center in pixels + * @return the ua.in.smartjava.map center in pixels */ public Point2D getMapCenterInPixelsAtZoom(int zoom) { @@ -211,7 +211,7 @@ public class TileFactoryInfo public String getTileUrl(int x, int y, int zoom) { // System.out.println("getting tile at zoom: " + zoom); - // System.out.println("map width at zoom = " + getMapWidthInTilesAtZoom(zoom)); + // System.out.println("ua.in.smartjava.map width at zoom = " + getMapWidthInTilesAtZoom(zoom)); String ypart = "&" + yparam + "=" + y; // System.out.println("ypart = " + ypart); diff --git a/src/main/java/org/jdesktop/swingx/mapviewer/WaypointRenderer.java b/src/main/java/org/jdesktop/swingx/mapviewer/WaypointRenderer.java index 6c4e22fd..445f8eb6 100644 --- a/src/main/java/org/jdesktop/swingx/mapviewer/WaypointRenderer.java +++ b/src/main/java/org/jdesktop/swingx/mapviewer/WaypointRenderer.java @@ -22,9 +22,9 @@ import org.jdesktop.swingx.JXMapViewer; public interface WaypointRenderer { /** - * paint the specified waypoint on the specified map and graphics context + * paint the specified waypoint on the specified ua.in.smartjava.map and graphics context * @param g the graphics2D object - * @param map the map + * @param map the ua.in.smartjava.map * @param waypoint the waypoint */ public void paintWaypoint(Graphics2D g, JXMapViewer map, W waypoint); diff --git a/src/main/java/org/jdesktop/swingx/mapviewer/bmng/SLMapServerInfo.java b/src/main/java/org/jdesktop/swingx/mapviewer/bmng/SLMapServerInfo.java index 6b3ed54a..d96d1237 100644 --- a/src/main/java/org/jdesktop/swingx/mapviewer/bmng/SLMapServerInfo.java +++ b/src/main/java/org/jdesktop/swingx/mapviewer/bmng/SLMapServerInfo.java @@ -20,7 +20,7 @@ package org.jdesktop.swingx.mapviewer.bmng; import org.jdesktop.swingx.mapviewer.TileFactoryInfo; /** - * A TileFactoryInfo subclass which knows how to connect to the SwingLabs map server. This server contains 2k resolution + * A TileFactoryInfo subclass which knows how to connect to the SwingLabs ua.in.smartjava.map server. This server contains 2k resolution * Blue Marble data from NASA. */ public class SLMapServerInfo extends TileFactoryInfo diff --git a/src/main/java/org/jdesktop/swingx/mapviewer/empty/EmptyTileFactory.java b/src/main/java/org/jdesktop/swingx/mapviewer/empty/EmptyTileFactory.java index db43285f..e75e4b2b 100644 --- a/src/main/java/org/jdesktop/swingx/mapviewer/empty/EmptyTileFactory.java +++ b/src/main/java/org/jdesktop/swingx/mapviewer/empty/EmptyTileFactory.java @@ -59,9 +59,9 @@ public class EmptyTileFactory extends TileFactory } /** - * Gets an instance of an empty tile for the given tile position and zoom on the world map. - * @param x The tile's x position on the world map. - * @param y The tile's y position on the world map. + * Gets an instance of an empty tile for the given tile position and zoom on the world ua.in.smartjava.map. + * @param x The tile's x position on the world ua.in.smartjava.map. + * @param y The tile's y position on the world ua.in.smartjava.map. * @param zoom The current zoom level. */ @Override diff --git a/src/main/java/org/jdesktop/swingx/mapviewer/esri/ESRITileFactory.java b/src/main/java/org/jdesktop/swingx/mapviewer/esri/ESRITileFactory.java index b4f0290b..632859f5 100644 --- a/src/main/java/org/jdesktop/swingx/mapviewer/esri/ESRITileFactory.java +++ b/src/main/java/org/jdesktop/swingx/mapviewer/esri/ESRITileFactory.java @@ -58,7 +58,7 @@ public class ESRITileFactory extends DefaultTileFactory { // "&usrid=&ds=&c=-117.1817|34.0556&sf=52500&fmt=&ocs="; // System.out.println("getting tile at zoom: " + zoom); - // System.out.println("map width at zoom = " + getMapWidthInTilesAtZoom(zoom)); + // System.out.println("ua.in.smartjava.map width at zoom = " + getMapWidthInTilesAtZoom(zoom)); // provide the center point of the tile, in lat/long coords int tileY = y; diff --git a/src/main/java/org/jdesktop/swingx/mapviewer/util/GeoUtil.java b/src/main/java/org/jdesktop/swingx/mapviewer/util/GeoUtil.java index 7c4b21de..83ea7b0b 100644 --- a/src/main/java/org/jdesktop/swingx/mapviewer/util/GeoUtil.java +++ b/src/main/java/org/jdesktop/swingx/mapviewer/util/GeoUtil.java @@ -31,7 +31,7 @@ public final class GeoUtil /** * @param zoom the zoom level * @param info the tile factory info - * @return the size of the map at the given zoom, in tiles (num tiles tall by num tiles wide) + * @return the size of the ua.in.smartjava.map at the given zoom, in tiles (num tiles tall by num tiles wide) */ public static Dimension getMapSize(int zoom, TileFactoryInfo info) { @@ -50,17 +50,17 @@ public final class GeoUtil { // int x = (int)coord.getX(); // int y = (int)coord.getY(); - // if off the map to the top or left + // if off the ua.in.smartjava.map to the top or left if (x < 0 || y < 0) { return false; } - // if of the map to the right + // if of the ua.in.smartjava.map to the right if (info.getMapCenterInPixelsAtZoom(zoomLevel).getX() * 2 <= x * info.getTileSize(zoomLevel)) { return false; } - // if off the map to the bottom + // if off the ua.in.smartjava.map to the bottom if (info.getMapCenterInPixelsAtZoom(zoomLevel).getY() * 2 <= y * info.getTileSize(zoomLevel)) { return false; @@ -136,8 +136,8 @@ public final class GeoUtil } /** - * Gets the map bounds. - * @param mapViewer The map viewer. + * Gets the ua.in.smartjava.map bounds. + * @param mapViewer The ua.in.smartjava.map viewer. * @return Returns the bounds. */ public static GeoBounds getMapBounds(JXMapViewer mapViewer) @@ -147,9 +147,9 @@ public final class GeoUtil /** * Gets the bounds as a set of two GeoPosition objects. - * @param mapViewer The map viewer. + * @param mapViewer The ua.in.smartjava.map viewer. * @return Returns the set of two GeoPosition objects that represent the north west and south east - * corners of the map. + * corners of the ua.in.smartjava.map. */ private static Set getMapGeoBounds(JXMapViewer mapViewer) { diff --git a/src/main/java/org/jdesktop/swingx/painter/AbstractPainter.java b/src/main/java/org/jdesktop/swingx/painter/AbstractPainter.java index 9ee25a72..ad0039a8 100644 --- a/src/main/java/org/jdesktop/swingx/painter/AbstractPainter.java +++ b/src/main/java/org/jdesktop/swingx/painter/AbstractPainter.java @@ -61,7 +61,7 @@ import org.jdesktop.swingx.util.GraphicsUtilities; public abstract class AbstractPainter extends AbstractBean implements Painter { /** * An enum representing the possible interpolation values of Bicubic, Bilinear, and - * Nearest Neighbor. These map to the underlying RenderingHints, + * Nearest Neighbor. These ua.in.smartjava.map to the underlying RenderingHints, * but are easier to use and serialization safe. */ public enum Interpolation { diff --git a/src/main/java/org/jdesktop/swingx/painter/CompoundPainter.java b/src/main/java/org/jdesktop/swingx/painter/CompoundPainter.java index d99d4896..1632db45 100644 --- a/src/main/java/org/jdesktop/swingx/painter/CompoundPainter.java +++ b/src/main/java/org/jdesktop/swingx/painter/CompoundPainter.java @@ -39,7 +39,7 @@ import java.util.concurrent.CopyOnWriteArrayList; *

A {@link Painter} implementation composed of an array of Painters. * CompoundPainter provides a means for combining several individual * Painters, or groups of them, into one logical unit. Each of the - * Painters are executed in order. BufferedImageOp filter effects can + * Painters are executed in order. BufferedImageOp ua.in.smartjava.filter effects can * be applied to them together as a whole. The entire set of painting operations * may be cached together.

* diff --git a/src/main/java/org/jdesktop/swingx/util/GraphicsUtilities.java b/src/main/java/org/jdesktop/swingx/util/GraphicsUtilities.java index 64a91062..d339256e 100644 --- a/src/main/java/org/jdesktop/swingx/util/GraphicsUtilities.java +++ b/src/main/java/org/jdesktop/swingx/util/GraphicsUtilities.java @@ -9,10 +9,10 @@ * Copyright (c) 2006 Romain Guy * All rights reserved. * - * Redistribution and use in source and binary forms, with or without + * Redistribution and use in ua.in.smartjava.source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * 1. Redistributions of source code must retain the above copyright + * 1. Redistributions of ua.in.smartjava.source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the @@ -151,7 +151,7 @@ public class GraphicsUtilities { * transparency as the image specified as a parameter. That is, the * returned BufferedImage will be compatible with the graphics hardware. * If this method is called in a headless environment, then - * the returned BufferedImage will be compatible with the source + * the returned BufferedImage will be compatible with the ua.in.smartjava.source * image.

* * @see java.awt.Transparency @@ -175,7 +175,7 @@ public class GraphicsUtilities { * That is, the returned BufferedImage is compatible with * the graphics hardware. If the method is called in a headless * environment, then the returned BufferedImage will be compatible with - * the source image.

+ * the ua.in.smartjava.source image.

* * @see java.awt.Transparency * @see #createCompatibleImage(java.awt.image.BufferedImage) @@ -203,7 +203,7 @@ public class GraphicsUtilities { * height. That is, the returned BufferedImage is compatible with * the graphics hardware. If the method is called in a headless * environment, then the returned BufferedImage will be compatible with - * the source image.

+ * the ua.in.smartjava.source image.

* * @see #createCompatibleImage(java.awt.image.BufferedImage) * @see #createCompatibleImage(java.awt.image.BufferedImage, int, int) @@ -226,7 +226,7 @@ public class GraphicsUtilities { * height. That is, the returned BufferedImage is compatible with * the graphics hardware. If the method is called in a headless * environment, then the returned BufferedImage will be compatible with - * the source image.

+ * the ua.in.smartjava.source image.

* * @see #createCompatibleImage(java.awt.image.BufferedImage) * @see #createCompatibleImage(java.awt.image.BufferedImage, int, int) @@ -298,7 +298,7 @@ public class GraphicsUtilities { * and therefore optimized for fast blitting operations.

* *

If the method is called in a headless environment, then the returned - * BufferedImage will be the source image.

+ * BufferedImage will be the ua.in.smartjava.source image.

* * @see #createCompatibleImage(java.awt.image.BufferedImage) * @see #createCompatibleImage(java.awt.image.BufferedImage, int, int) @@ -335,12 +335,12 @@ public class GraphicsUtilities { } /** - *

Returns a thumbnail of a source image. newSize defines + *

Returns a thumbnail of a ua.in.smartjava.source image. newSize defines * the length of the longest dimension of the thumbnail. The other * dimension is then computed according to the dimensions ratio of the * original picture.

*

This method favors speed over quality. When the new size is less than - * half the longest dimension of the source image, + * half the longest dimension of the ua.in.smartjava.source image, * {@link #createThumbnail(BufferedImage, int)} or * {@link #createThumbnail(BufferedImage, int, int)} should be used instead * to ensure the quality of the result without sacrificing too much @@ -349,7 +349,7 @@ public class GraphicsUtilities { * @see #createThumbnailFast(java.awt.image.BufferedImage, int, int) * @see #createThumbnail(java.awt.image.BufferedImage, int) * @see #createThumbnail(java.awt.image.BufferedImage, int, int) - * @param image the source image + * @param image the ua.in.smartjava.source image * @param newSize the length of the largest dimension of the thumbnail * @return a new compatible BufferedImage containing a * thumbnail of image @@ -403,9 +403,9 @@ public class GraphicsUtilities { } /** - *

Returns a thumbnail of a source image.

+ *

Returns a thumbnail of a ua.in.smartjava.source image.

*

This method favors speed over quality. When the new size is less than - * half the longest dimension of the source image, + * half the longest dimension of the ua.in.smartjava.source image, * {@link #createThumbnail(BufferedImage, int)} or * {@link #createThumbnail(BufferedImage, int, int)} should be used instead * to ensure the quality of the result without sacrificing too much @@ -414,7 +414,7 @@ public class GraphicsUtilities { * @see #createThumbnailFast(java.awt.image.BufferedImage, int) * @see #createThumbnail(java.awt.image.BufferedImage, int) * @see #createThumbnail(java.awt.image.BufferedImage, int, int) - * @param image the source image + * @param image the ua.in.smartjava.source image * @param newWidth the width of the thumbnail * @param newHeight the height of the thumbnail * @return a new compatible BufferedImage containing a @@ -451,20 +451,20 @@ public class GraphicsUtilities { } /** - *

Returns a thumbnail of a source image. newSize defines + *

Returns a thumbnail of a ua.in.smartjava.source image. newSize defines * the length of the longest dimension of the thumbnail. The other * dimension is then computed according to the dimensions ratio of the * original picture.

*

This method offers a good trade-off between speed and quality. * The result looks better than * {@link #createThumbnailFast(java.awt.image.BufferedImage, int)} when - * the new size is less than half the longest dimension of the source + * the new size is less than half the longest dimension of the ua.in.smartjava.source * image, yet the rendering speed is almost similar.

* * @see #createThumbnailFast(java.awt.image.BufferedImage, int, int) * @see #createThumbnailFast(java.awt.image.BufferedImage, int) * @see #createThumbnail(java.awt.image.BufferedImage, int, int) - * @param image the source image + * @param image the ua.in.smartjava.source image * @param newSize the length of the largest dimension of the thumbnail * @return a new compatible BufferedImage containing a * thumbnail of image @@ -567,17 +567,17 @@ public class GraphicsUtilities { } /** - *

Returns a thumbnail of a source image.

+ *

Returns a thumbnail of a ua.in.smartjava.source image.

*

This method offers a good trade-off between speed and quality. * The result looks better than * {@link #createThumbnailFast(java.awt.image.BufferedImage, int)} when - * the new size is less than half the longest dimension of the source + * the new size is less than half the longest dimension of the ua.in.smartjava.source * image, yet the rendering speed is almost similar.

* * @see #createThumbnailFast(java.awt.image.BufferedImage, int) * @see #createThumbnailFast(java.awt.image.BufferedImage, int, int) * @see #createThumbnail(java.awt.image.BufferedImage, int) - * @param image the source image + * @param image the ua.in.smartjava.source image * @param newWidth the width of the thumbnail * @param newHeight the height of the thumbnail * @return a new compatible BufferedImage containing a @@ -678,7 +678,7 @@ public class GraphicsUtilities { * an image of type different from BufferedImage.TYPE_INT_ARGB * and BufferedImage.TYPE_INT_RGB will unmanage the image.

* - * @param img the source image + * @param img the ua.in.smartjava.source image * @param x the x location at which to start grabbing pixels * @param y the y location at which to start grabbing pixels * @param w the width of the rectangle of pixels to grab diff --git a/src/main/java/playlist/PlaylistManager.java b/src/main/java/playlist/PlaylistManager.java index 6ca21ecf..186972b8 100644 --- a/src/main/java/playlist/PlaylistManager.java +++ b/src/main/java/playlist/PlaylistManager.java @@ -17,22 +17,22 @@ ******************************************************************************/ package playlist; -import alias.AliasEvent; -import alias.AliasModel; -import audio.broadcast.BroadcastEvent; -import audio.broadcast.BroadcastModel; -import controller.channel.Channel.ChannelType; -import controller.channel.ChannelEvent; -import controller.channel.ChannelEventListener; -import controller.channel.ChannelModel; -import controller.channel.map.ChannelMapEvent; -import controller.channel.map.ChannelMapModel; +import ua.in.smartjava.alias.AliasEvent; +import ua.in.smartjava.alias.AliasModel; +import ua.in.smartjava.audio.broadcast.BroadcastEvent; +import ua.in.smartjava.audio.broadcast.BroadcastModel; +import ua.in.smartjava.controller.channel.Channel.ChannelType; +import ua.in.smartjava.controller.channel.ChannelEvent; +import ua.in.smartjava.controller.channel.ChannelEventListener; +import ua.in.smartjava.controller.channel.ChannelModel; +import ua.in.smartjava.controller.channel.map.ChannelMapEvent; +import ua.in.smartjava.controller.channel.map.ChannelMapModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import playlist.version1.PlaylistConverterV1ToV2; -import properties.SystemProperties; -import sample.Listener; -import util.ThreadPool; +import ua.in.smartjava.properties.SystemProperties; +import ua.in.smartjava.sample.Listener; +import ua.in.smartjava.util.ThreadPool; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; @@ -65,8 +65,8 @@ public class PlaylistManager implements ChannelEventListener private boolean mPlaylistLoading = false; /** - * Playlist manager - manages all channel configurations, channel maps, and - * alias lists and handles loading or persisting to a playlist.xml file + * Playlist manager - manages all ua.in.smartjava.channel configurations, ua.in.smartjava.channel maps, and + * ua.in.smartjava.alias lists and handles loading or persisting to a playlist.xml file * * Monitors playlist changes to automatically save configuration changes * after they occur. @@ -80,7 +80,7 @@ public class PlaylistManager implements ChannelEventListener mChannelModel = channelModel; mChannelMapModel = channelMapModel; - //Register for alias, channel and channel map events so that we can + //Register for ua.in.smartjava.alias, ua.in.smartjava.channel and ua.in.smartjava.channel ua.in.smartjava.map events so that we can //save the playlist when there are any changes mChannelModel.addListener(this); @@ -89,7 +89,7 @@ public class PlaylistManager implements ChannelEventListener @Override public void receive(AliasEvent t) { - //Save the playlist for all alias events + //Save the playlist for all ua.in.smartjava.alias events schedulePlaylistSave(); } }); @@ -99,7 +99,7 @@ public class PlaylistManager implements ChannelEventListener @Override public void receive(ChannelMapEvent t) { - //Save the playlist for all channel map events + //Save the playlist for all ua.in.smartjava.channel ua.in.smartjava.map events schedulePlaylistSave(); } }); @@ -188,7 +188,7 @@ public class PlaylistManager implements ChannelEventListener /** - * Channel event listener method. Monitors channel events for events that indicate that the playlist has changed + * Channel event listener method. Monitors ua.in.smartjava.channel events for events that indicate that the playlist has changed * and queues automatic playlist saving. */ @Override diff --git a/src/main/java/playlist/PlaylistV2.java b/src/main/java/playlist/PlaylistV2.java index 584ba6f6..7b1666eb 100644 --- a/src/main/java/playlist/PlaylistV2.java +++ b/src/main/java/playlist/PlaylistV2.java @@ -17,10 +17,10 @@ ******************************************************************************/ package playlist; -import alias.Alias; -import audio.broadcast.BroadcastConfiguration; -import controller.channel.Channel; -import controller.channel.map.ChannelMap; +import ua.in.smartjava.alias.Alias; +import ua.in.smartjava.audio.broadcast.BroadcastConfiguration; +import ua.in.smartjava.controller.channel.Channel; +import ua.in.smartjava.controller.channel.map.ChannelMap; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; diff --git a/src/main/java/playlist/version1/AliasDirectory.java b/src/main/java/playlist/version1/AliasDirectory.java index 49c64eb7..4a9c81a2 100644 --- a/src/main/java/playlist/version1/AliasDirectory.java +++ b/src/main/java/playlist/version1/AliasDirectory.java @@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; -import alias.AliasList; +import ua.in.smartjava.alias.AliasList; @XmlSeeAlso( { AliasList.class} ) @XmlRootElement( name = "alias_directory" ) @@ -72,7 +72,7 @@ public class AliasDirectory } /** - * Gets the named alias list, or returns an empty alias list + * Gets the named ua.in.smartjava.alias list, or returns an empty ua.in.smartjava.alias list */ public AliasListOld getAliasList( String name ) { diff --git a/src/main/java/playlist/version1/AliasListOld.java b/src/main/java/playlist/version1/AliasListOld.java index b3dc3908..1b7cbb11 100644 --- a/src/main/java/playlist/version1/AliasListOld.java +++ b/src/main/java/playlist/version1/AliasListOld.java @@ -17,25 +17,25 @@ ******************************************************************************/ package playlist.version1; -import alias.Alias; -import alias.action.AliasAction; -import alias.action.beep.BeepAction; -import alias.action.clip.ClipAction; -import alias.action.script.ScriptAction; -import alias.id.AliasID; -import alias.id.esn.Esn; -import alias.id.fleetsync.FleetsyncID; -import alias.id.lojack.LoJackFunctionAndID; -import alias.id.mdc.MDC1200ID; -import alias.id.mobileID.Min; -import alias.id.mpt1327.MPT1327ID; -import alias.id.nonrecordable.NonRecordable; -import alias.id.priority.Priority; -import alias.id.siteID.SiteID; -import alias.id.status.StatusID; -import alias.id.talkgroup.TalkgroupID; -import alias.id.uniqueID.UniqueID; -import module.decode.lj1200.LJ1200Message.Function; +import ua.in.smartjava.alias.Alias; +import ua.in.smartjava.alias.action.AliasAction; +import ua.in.smartjava.alias.action.beep.BeepAction; +import ua.in.smartjava.alias.action.clip.ClipAction; +import ua.in.smartjava.alias.action.script.ScriptAction; +import ua.in.smartjava.alias.id.AliasID; +import ua.in.smartjava.alias.id.esn.Esn; +import ua.in.smartjava.alias.id.fleetsync.FleetsyncID; +import ua.in.smartjava.alias.id.lojack.LoJackFunctionAndID; +import ua.in.smartjava.alias.id.mdc.MDC1200ID; +import ua.in.smartjava.alias.id.mobileID.Min; +import ua.in.smartjava.alias.id.mpt1327.MPT1327ID; +import ua.in.smartjava.alias.id.nonrecordable.NonRecordable; +import ua.in.smartjava.alias.id.priority.Priority; +import ua.in.smartjava.alias.id.siteID.SiteID; +import ua.in.smartjava.alias.id.status.StatusID; +import ua.in.smartjava.alias.id.talkgroup.TalkgroupID; +import ua.in.smartjava.alias.id.uniqueID.UniqueID; +import ua.in.smartjava.module.decode.lj1200.LJ1200Message.Function; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/playlist/version1/ChannelMapList.java b/src/main/java/playlist/version1/ChannelMapList.java index 5d0f6d61..046fe8a1 100644 --- a/src/main/java/playlist/version1/ChannelMapList.java +++ b/src/main/java/playlist/version1/ChannelMapList.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSeeAlso; -import controller.channel.map.ChannelMap; +import ua.in.smartjava.controller.channel.map.ChannelMap; @XmlSeeAlso( ChannelMap.class ) @Deprecated @@ -62,7 +62,7 @@ public class ChannelMapList } /** - * Gets the named channel map, or returns an empty map + * Gets the named ua.in.smartjava.channel ua.in.smartjava.map, or returns an empty ua.in.smartjava.map */ public ChannelMap getChannelMap( String name ) { diff --git a/src/main/java/playlist/version1/Group.java b/src/main/java/playlist/version1/Group.java index d8a17d0f..69f249ed 100644 --- a/src/main/java/playlist/version1/Group.java +++ b/src/main/java/playlist/version1/Group.java @@ -21,7 +21,7 @@ import java.util.ArrayList; import javax.xml.bind.annotation.XmlAttribute; -import alias.Alias; +import ua.in.smartjava.alias.Alias; @Deprecated public class Group diff --git a/src/main/java/playlist/version1/PlaylistConverterV1ToV2.java b/src/main/java/playlist/version1/PlaylistConverterV1ToV2.java index 2ed14fd4..381782c9 100644 --- a/src/main/java/playlist/version1/PlaylistConverterV1ToV2.java +++ b/src/main/java/playlist/version1/PlaylistConverterV1ToV2.java @@ -16,9 +16,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import playlist.PlaylistV2; -import alias.Alias; -import controller.channel.Channel; -import controller.channel.map.ChannelMap; +import ua.in.smartjava.alias.Alias; +import ua.in.smartjava.controller.channel.Channel; +import ua.in.smartjava.controller.channel.map.ChannelMap; public class PlaylistConverterV1ToV2 { @@ -35,7 +35,7 @@ public class PlaylistConverterV1ToV2 if( path != null && Files.exists( path ) ) { - mLog.info( "attempting playlist v1 to v2 conversion [" + + mLog.info( "attempting playlist v1 to v2 conversion [" + path.toString() + "]" ); JAXBContext context = null; @@ -56,13 +56,13 @@ public class PlaylistConverterV1ToV2 } catch ( JAXBException e ) { - mErrors.add( "Couldn't unmarshall version 1 playlist - " + + mErrors.add( "Couldn't unmarshall version 1 playlist - " + e.getLocalizedMessage() ); } } catch ( Exception e ) { - mErrors.add( "Couldn't open version 1 playlist - [" + + mErrors.add( "Couldn't open version 1 playlist - [" + path.toString() + "] - " + e.getLocalizedMessage() ); } finally @@ -83,7 +83,7 @@ public class PlaylistConverterV1ToV2 } else { - mErrors.add( "version 1 playlist is null or not found [" + + mErrors.add( "version 1 playlist is null or not found [" + path.toString() + "]" ); } @@ -131,7 +131,7 @@ public class PlaylistConverterV1ToV2 if( playlistVersion1.hasChannelMapList() ) { - //Move the channel maps out of the channel map list + //Move the ua.in.smartjava.channel maps out of the ua.in.smartjava.channel ua.in.smartjava.map list ChannelMapList channelMapList = playlistVersion1.getChannelMapList(); List channelMaps = channelMapList.getChannelMap(); @@ -147,7 +147,7 @@ public class PlaylistConverterV1ToV2 mLog.info( "Converted [" + mConvertedPlaylist.getAliases().size() + "] aliases to new playlist format" ); mLog.info( "Converted [" + mConvertedPlaylist.getChannelMaps().size() + - "] channel maps to new playlist format" ); + "] ua.in.smartjava.channel maps to new playlist format" ); } } diff --git a/src/main/java/playlist/version1/PlaylistV1.java b/src/main/java/playlist/version1/PlaylistV1.java index 52e8dc4a..452cead2 100644 --- a/src/main/java/playlist/version1/PlaylistV1.java +++ b/src/main/java/playlist/version1/PlaylistV1.java @@ -21,8 +21,8 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; -import alias.Alias; -import controller.channel.Channel; +import ua.in.smartjava.alias.Alias; +import ua.in.smartjava.controller.channel.Channel; @XmlSeeAlso( { AliasDirectory.class, Alias.class, @@ -31,7 +31,7 @@ import controller.channel.Channel; SystemList.class } ) @Deprecated -@XmlRootElement( name = "playlist" ) +@XmlRootElement( name = "playlist") public class PlaylistV1 { //Note: these are for legacy version 1 format playlists diff --git a/src/main/java/playlist/version1/Site.java b/src/main/java/playlist/version1/Site.java index 876fc30b..35f52895 100644 --- a/src/main/java/playlist/version1/Site.java +++ b/src/main/java/playlist/version1/Site.java @@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; -import controller.channel.Channel; +import ua.in.smartjava.controller.channel.Channel; @XmlSeeAlso( { Channel.class } ) @XmlRootElement( name = "site" ) diff --git a/src/main/java/settings/ColorSettingMenuItem.java b/src/main/java/settings/ColorSettingMenuItem.java index d6045aae..c4314ecb 100644 --- a/src/main/java/settings/ColorSettingMenuItem.java +++ b/src/main/java/settings/ColorSettingMenuItem.java @@ -25,7 +25,7 @@ import javax.swing.JColorChooser; import javax.swing.JMenuItem; import settings.ColorSetting.ColorSettingName; -import util.ColorIcon; +import ua.in.smartjava.util.ColorIcon; /** * JMenuItem for selecting a color and automatically setting (saving) the diff --git a/src/main/java/settings/Settings.java b/src/main/java/settings/Settings.java index a7f2d261..3a4b19b3 100644 --- a/src/main/java/settings/Settings.java +++ b/src/main/java/settings/Settings.java @@ -24,17 +24,17 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; -import map.DefaultIcon; -import map.MapIcon; +import ua.in.smartjava.map.DefaultIcon; +import ua.in.smartjava.map.MapIcon; import settings.ColorSetting.ColorSettingName; -import source.recording.RecordingConfiguration; -import source.tuner.airspy.AirspyTunerConfiguration; -import source.tuner.configuration.TunerConfiguration; -import source.tuner.fcd.proV1.FCD1TunerConfiguration; -import source.tuner.fcd.proplusV2.FCD2TunerConfiguration; -import source.tuner.hackrf.HackRFTunerConfiguration; -import source.tuner.rtl.e4k.E4KTunerConfiguration; -import source.tuner.rtl.r820t.R820TTunerConfiguration; +import ua.in.smartjava.source.recording.RecordingConfiguration; +import ua.in.smartjava.source.tuner.airspy.AirspyTunerConfiguration; +import ua.in.smartjava.source.tuner.configuration.TunerConfiguration; +import ua.in.smartjava.source.tuner.fcd.proV1.FCD1TunerConfiguration; +import ua.in.smartjava.source.tuner.fcd.proplusV2.FCD2TunerConfiguration; +import ua.in.smartjava.source.tuner.hackrf.HackRFTunerConfiguration; +import ua.in.smartjava.source.tuner.rtl.e4k.E4KTunerConfiguration; +import ua.in.smartjava.source.tuner.rtl.r820t.R820TTunerConfiguration; /** * Support for persisting via JAXB all configured SDRTrunk settings diff --git a/src/main/java/settings/SettingsManager.java b/src/main/java/settings/SettingsManager.java index 87d65bce..15bbfa10 100644 --- a/src/main/java/settings/SettingsManager.java +++ b/src/main/java/settings/SettingsManager.java @@ -20,13 +20,13 @@ package settings; import org.jdesktop.swingx.mapviewer.GeoPosition; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import properties.SystemProperties; -import sample.Listener; +import ua.in.smartjava.properties.SystemProperties; +import ua.in.smartjava.sample.Listener; import settings.ColorSetting.ColorSettingName; -import source.recording.RecordingConfiguration; -import source.tuner.configuration.TunerConfigurationEvent; -import source.tuner.configuration.TunerConfigurationModel; -import util.ThreadPool; +import ua.in.smartjava.source.recording.RecordingConfiguration; +import ua.in.smartjava.source.tuner.configuration.TunerConfigurationEvent; +import ua.in.smartjava.source.tuner.configuration.TunerConfigurationModel; +import ua.in.smartjava.util.ThreadPool; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; @@ -305,7 +305,7 @@ public class SettingsManager implements Listener catch(JAXBException e) { mLog.error("SettingsManager - jaxb exception while saving " + - "settings", e); + "settings", e); } } catch(Exception e) @@ -360,7 +360,7 @@ public class SettingsManager implements Listener catch(JAXBException e) { mLog.error("SettingsManager - jaxb exception while loading " + - "settings", e); + "settings", e); } } catch(Exception e) diff --git a/src/main/java/source/ComplexSource.java b/src/main/java/source/ComplexSource.java deleted file mode 100644 index e7e1939c..00000000 --- a/src/main/java/source/ComplexSource.java +++ /dev/null @@ -1,13 +0,0 @@ -package source; - -import sample.Provider; -import sample.SampleType; -import sample.complex.ComplexBuffer; - -public abstract class ComplexSource extends Source implements Provider -{ - public ComplexSource() - { - super( SampleType.COMPLEX ); - } -} diff --git a/src/main/java/source/RealSource.java b/src/main/java/source/RealSource.java deleted file mode 100644 index b512bfbc..00000000 --- a/src/main/java/source/RealSource.java +++ /dev/null @@ -1,14 +0,0 @@ -package source; - -import sample.Provider; -import sample.SampleType; -import sample.real.RealBuffer; - - -public abstract class RealSource extends Source implements Provider -{ - public RealSource() - { - super( SampleType.REAL ); - } -} diff --git a/src/main/java/source/tuner/TunerChannelProvider.java b/src/main/java/source/tuner/TunerChannelProvider.java deleted file mode 100644 index 8f53f144..00000000 --- a/src/main/java/source/tuner/TunerChannelProvider.java +++ /dev/null @@ -1,27 +0,0 @@ -package source.tuner; - -import java.util.concurrent.RejectedExecutionException; - -import source.SourceException; - -public interface TunerChannelProvider -{ - /** - * Returns a tuner frequency channel source, tuned to the correct frequency - * - * @param frequency - desired frequency - * - * @return - source for 48k sample rate - */ - public abstract TunerChannelSource getChannel( TunerChannel channel ) - throws RejectedExecutionException, SourceException; - - /** - * Releases the tuned channel resources - * - * @param channel - previously obtained tuner channel - */ - public abstract void releaseChannel( TunerChannelSource source ); - - -} diff --git a/src/main/java/alias/Alias.java b/src/main/java/ua/in/smartjava/alias/Alias.java similarity index 84% rename from src/main/java/alias/Alias.java rename to src/main/java/ua/in/smartjava/alias/Alias.java index 8f8b5ba5..4e6bc314 100644 --- a/src/main/java/alias/Alias.java +++ b/src/main/java/ua/in/smartjava/alias/Alias.java @@ -15,11 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias; +package ua.in.smartjava.alias; import java.awt.Color; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Set; import java.util.TreeSet; @@ -30,15 +29,15 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlTransient; -import alias.action.AliasAction; -import alias.id.AliasID; -import alias.id.AliasIDType; -import alias.id.broadcast.BroadcastChannel; -import alias.id.nonrecordable.NonRecordable; -import alias.id.priority.Priority; +import ua.in.smartjava.alias.action.AliasAction; +import ua.in.smartjava.alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasIDType; +import ua.in.smartjava.alias.id.broadcast.BroadcastChannel; +import ua.in.smartjava.alias.id.nonrecordable.NonRecordable; +import ua.in.smartjava.alias.id.priority.Priority; @XmlSeeAlso( { AliasID.class, AliasAction.class } ) -@XmlRootElement( name = "alias" ) +@XmlRootElement( name = "ua/in/smartjava/alias") public class Alias { private String mList; @@ -181,13 +180,13 @@ public class Alias } /** - * Perform any validation/cleanup actions on this alias. + * Perform any validation/cleanup actions on this ua.in.smartjava.alias. */ public void validate() { } /** - * Returns the priority level of this alias, if defined, or the default priority + * Returns the priority level of this ua.in.smartjava.alias, if defined, or the default priority */ @XmlTransient public int getCallPriority() @@ -241,7 +240,7 @@ public class Alias } /** - * Inspects the alias for a non-recordable alias id. Default is true; + * Inspects the ua.in.smartjava.alias for a non-recordable ua.in.smartjava.alias id. Default is true; */ @XmlTransient public boolean isRecordable() @@ -258,7 +257,7 @@ public class Alias } /** - * Sets or removes the non-recordable alias ID for this alias. + * Sets or removes the non-recordable ua.in.smartjava.alias ID for this ua.in.smartjava.alias. */ public void setRecordable( boolean recordable ) { @@ -295,7 +294,7 @@ public class Alias } /** - * Inspects the alias for broadcast channel/streamable alias ids. Default is false; + * Inspects the ua.in.smartjava.alias for broadcast ua.in.smartjava.channel/streamable ua.in.smartjava.alias ids. Default is false; */ @XmlTransient public boolean isStreamable() @@ -312,7 +311,7 @@ public class Alias } /** - * List of broadcast channels specified for this alias. + * List of broadcast channels specified for this ua.in.smartjava.alias. */ @XmlTransient public Set getBroadcastChannels() @@ -331,7 +330,7 @@ public class Alias } /** - * Indicates if this alias contains a broadcast channel alias id with the channel name. + * Indicates if this ua.in.smartjava.alias contains a broadcast ua.in.smartjava.channel ua.in.smartjava.alias id with the ua.in.smartjava.channel name. */ public boolean hasBroadcastChannel(String channel) { diff --git a/src/main/java/alias/AliasController.java b/src/main/java/ua/in/smartjava/alias/AliasController.java similarity index 92% rename from src/main/java/alias/AliasController.java rename to src/main/java/ua/in/smartjava/alias/AliasController.java index 7dc27ccf..33075f91 100644 --- a/src/main/java/alias/AliasController.java +++ b/src/main/java/ua/in/smartjava/alias/AliasController.java @@ -1,9 +1,9 @@ -package alias; +package ua.in.smartjava.alias; -import audio.broadcast.BroadcastModel; +import ua.in.smartjava.audio.broadcast.BroadcastModel; import com.jidesoft.swing.JideSplitPane; -import gui.editor.Editor; -import icon.IconManager; +import ua.in.smartjava.gui.editor.Editor; +import ua.in.smartjava.icon.IconManager; import net.coderazzi.filters.gui.AutoChoices; import net.coderazzi.filters.gui.TableFilterHeader; import net.miginfocom.swing.MigLayout; @@ -83,17 +83,17 @@ public class AliasController extends JPanel new MigLayout("insets 0 0 0 0", "[grow,fill][grow,fill][grow,fill]", "[]")); mNewButton.addActionListener(this); - mNewButton.setToolTipText("Adds a new alias"); + mNewButton.setToolTipText("Adds a new ua.in.smartjava.alias"); buttonsPanel.add(mNewButton); mCopyButton.addActionListener(this); mCopyButton.setEnabled(false); - mCopyButton.setToolTipText("Creates a copy of the currently selected alias and adds it"); + mCopyButton.setToolTipText("Creates a copy of the currently selected ua.in.smartjava.alias and adds it"); buttonsPanel.add(mCopyButton); mDeleteButton.addActionListener(this); mDeleteButton.setEnabled(false); - mDeleteButton.setToolTipText("Deletes the currently selected alias"); + mDeleteButton.setToolTipText("Deletes the currently selected ua.in.smartjava.alias"); buttonsPanel.add(mDeleteButton); JPanel listAndButtonsPanel = new JPanel(); @@ -114,7 +114,7 @@ public class AliasController extends JPanel } /** - * Sets the editor argument as the currently visible alias editor + * Sets the editor argument as the currently visible ua.in.smartjava.alias editor */ private void setEditor(Editor editor) { @@ -208,16 +208,16 @@ public class AliasController extends JPanel } /** - * Adds the alias to the alias table/model and scrolls the view it + * Adds the ua.in.smartjava.alias to the ua.in.smartjava.alias table/model and scrolls the view it */ private void addAlias(Alias alias) { //HACK: when inserting a row to the model, the JTable gets - //notified and attempts to tell the coderazzi table filter - //adaptive choices filter to refresh before the table filter is + //notified and attempts to tell the coderazzi table ua.in.smartjava.filter + //adaptive choices ua.in.smartjava.filter to refresh before the table ua.in.smartjava.filter is //notified of the row additions, causing an index out of bounds //exception. We turn off adaptive choices temporarily, add the - //channel, and turn on adaptive choices again. + //ua.in.smartjava.channel, and turn on adaptive choices again. mTableFilterHeader.setAdaptiveChoices(false); int index = mAliasModel.addAlias(alias); @@ -278,7 +278,7 @@ public class AliasController extends JPanel if(toDelete != null && !toDelete.isEmpty()) { String title = toDelete.size() == 1 ? "Delete Alias?" : "Delete Aliases?"; - String prompt = toDelete.size() == 1 ? "Do you want to delete this alias?" : + String prompt = toDelete.size() == 1 ? "Do you want to delete this ua.in.smartjava.alias?" : "Do you want to delete these " + toDelete.size() + " aliases?"; int choice = JOptionPane.showConfirmDialog(AliasController.this, @@ -322,7 +322,7 @@ public class AliasController extends JPanel } /** - * Displays cell's icon and name + * Displays cell's ua.in.smartjava.icon and name */ public class IconCellRenderer extends DefaultTableCellRenderer { diff --git a/src/main/java/alias/AliasEditor.java b/src/main/java/ua/in/smartjava/alias/AliasEditor.java similarity index 84% rename from src/main/java/alias/AliasEditor.java rename to src/main/java/ua/in/smartjava/alias/AliasEditor.java index 706ef5e4..8a31f8f7 100644 --- a/src/main/java/alias/AliasEditor.java +++ b/src/main/java/ua/in/smartjava/alias/AliasEditor.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias; +package ua.in.smartjava.alias; -import audio.broadcast.BroadcastModel; -import gui.editor.Editor; +import ua.in.smartjava.audio.broadcast.BroadcastModel; +import ua.in.smartjava.gui.editor.Editor; import java.awt.Color; import java.awt.event.ActionEvent; @@ -28,12 +28,11 @@ import javax.swing.JButton; import javax.swing.JLabel; import javax.swing.JSeparator; -import icon.IconManager; +import ua.in.smartjava.icon.IconManager; import net.miginfocom.swing.MigLayout; -import sample.Listener; -import settings.SettingsManager; -import alias.action.AliasActionEditor; -import alias.id.AliasIdentifierEditor; +import ua.in.smartjava.sample.Listener; +import ua.in.smartjava.alias.action.AliasActionEditor; +import ua.in.smartjava.alias.id.AliasIdentifierEditor; import com.jidesoft.swing.JideTabbedPane; @@ -42,7 +41,7 @@ public class AliasEditor extends Editor { private static final long serialVersionUID = 1L; - private static final String DEFAULT_NAME = "select an alias"; + private static final String DEFAULT_NAME = "select an ua.in.smartjava.alias"; private AliasModel mAliasModel; @@ -105,12 +104,12 @@ public class AliasEditor extends Editor //Playlist management buttons JButton btnSave = new JButton( "Save" ); - btnSave.setToolTipText( "Save alias changes to the playlist" ); + btnSave.setToolTipText( "Save ua.in.smartjava.alias changes to the playlist" ); btnSave.addActionListener( AliasEditor.this ); add( btnSave ); JButton btnReset = new JButton( "Reset" ); - btnReset.setToolTipText( "Reset alias changes since last save" ); + btnReset.setToolTipText( "Reset ua.in.smartjava.alias changes since last save" ); btnReset.addActionListener( AliasEditor.this ); add( btnReset, "wrap" ); } @@ -118,13 +117,13 @@ public class AliasEditor extends Editor @Override public void receive( AliasEvent event ) { - //If this is the currently displayed alias, reload it + //If this is the currently displayed ua.in.smartjava.alias, reload it if( hasItem() && getItem() == event.getAlias() ) { switch( event.getEvent() ) { case CHANGE: - //Alias changed - reset the editor with changed alias + //Alias changed - reset the editor with changed ua.in.smartjava.alias setItem( event.getAlias() ); break; case DELETE: diff --git a/src/main/java/alias/AliasEvent.java b/src/main/java/ua/in/smartjava/alias/AliasEvent.java similarity index 89% rename from src/main/java/alias/AliasEvent.java rename to src/main/java/ua/in/smartjava/alias/AliasEvent.java index c1cacd74..7fd8ce5f 100644 --- a/src/main/java/alias/AliasEvent.java +++ b/src/main/java/ua/in/smartjava/alias/AliasEvent.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias; +package ua.in.smartjava.alias; public class AliasEvent { @@ -23,8 +23,8 @@ public class AliasEvent private Event mEvent; /** - * AliasEvent - event describing any changes to an alias - * @param alias - alias that changed + * AliasEvent - event describing any changes to an ua.in.smartjava.alias + * @param alias - ua.in.smartjava.alias that changed * @param event - change event */ public AliasEvent( Alias alias, Event event ) diff --git a/src/main/java/alias/AliasFactory.java b/src/main/java/ua/in/smartjava/alias/AliasFactory.java similarity index 78% rename from src/main/java/alias/AliasFactory.java rename to src/main/java/ua/in/smartjava/alias/AliasFactory.java index 7acb920e..578ca6fc 100644 --- a/src/main/java/alias/AliasFactory.java +++ b/src/main/java/ua/in/smartjava/alias/AliasFactory.java @@ -15,47 +15,47 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias; +package ua.in.smartjava.alias; -import alias.action.AliasAction; -import alias.action.AliasActionType; -import alias.action.beep.BeepAction; -import alias.action.beep.BeepActionEditor; -import alias.action.clip.ClipAction; -import alias.action.clip.ClipActionEditor; -import alias.action.script.ScriptAction; -import alias.action.script.ScriptActionEditor; -import alias.id.AliasID; -import alias.id.AliasIDType; -import alias.id.broadcast.BroadcastChannel; -import alias.id.broadcast.BroadcastChannelEditor; -import alias.id.esn.ESNEditor; -import alias.id.esn.Esn; -import alias.id.fleetsync.FleetsyncID; -import alias.id.fleetsync.FleetsyncIDEditor; -import alias.id.lojack.LoJackFunctionAndID; -import alias.id.lojack.LoJackIDEditor; -import alias.id.mdc.MDC1200ID; -import alias.id.mdc.MDC1200IDEditor; -import alias.id.mobileID.MINEditor; -import alias.id.mobileID.Min; -import alias.id.mpt1327.MPT1327ID; -import alias.id.mpt1327.MPT1327IDEditor; -import alias.id.nonrecordable.NonRecordable; -import alias.id.nonrecordable.NonRecordableEditor; -import alias.id.priority.Priority; -import alias.id.priority.PriorityEditor; -import alias.id.siteID.SiteID; -import alias.id.siteID.SiteIDEditor; -import alias.id.status.StatusID; -import alias.id.status.StatusIDEditor; -import alias.id.talkgroup.TalkgroupID; -import alias.id.talkgroup.TalkgroupIDEditor; -import alias.id.uniqueID.UniqueID; -import alias.id.uniqueID.UniqueIDEditor; -import audio.broadcast.BroadcastModel; -import gui.editor.Editor; -import gui.editor.EmptyEditor; +import ua.in.smartjava.alias.action.AliasAction; +import ua.in.smartjava.alias.action.AliasActionType; +import ua.in.smartjava.alias.action.beep.BeepAction; +import ua.in.smartjava.alias.action.beep.BeepActionEditor; +import ua.in.smartjava.alias.action.clip.ClipAction; +import ua.in.smartjava.alias.action.clip.ClipActionEditor; +import ua.in.smartjava.alias.action.script.ScriptAction; +import ua.in.smartjava.alias.action.script.ScriptActionEditor; +import ua.in.smartjava.alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasIDType; +import ua.in.smartjava.alias.id.broadcast.BroadcastChannel; +import ua.in.smartjava.alias.id.broadcast.BroadcastChannelEditor; +import ua.in.smartjava.alias.id.esn.ESNEditor; +import ua.in.smartjava.alias.id.esn.Esn; +import ua.in.smartjava.alias.id.fleetsync.FleetsyncID; +import ua.in.smartjava.alias.id.fleetsync.FleetsyncIDEditor; +import ua.in.smartjava.alias.id.lojack.LoJackFunctionAndID; +import ua.in.smartjava.alias.id.lojack.LoJackIDEditor; +import ua.in.smartjava.alias.id.mdc.MDC1200ID; +import ua.in.smartjava.alias.id.mdc.MDC1200IDEditor; +import ua.in.smartjava.alias.id.mobileID.MINEditor; +import ua.in.smartjava.alias.id.mobileID.Min; +import ua.in.smartjava.alias.id.mpt1327.MPT1327ID; +import ua.in.smartjava.alias.id.mpt1327.MPT1327IDEditor; +import ua.in.smartjava.alias.id.nonrecordable.NonRecordable; +import ua.in.smartjava.alias.id.nonrecordable.NonRecordableEditor; +import ua.in.smartjava.alias.id.priority.Priority; +import ua.in.smartjava.alias.id.priority.PriorityEditor; +import ua.in.smartjava.alias.id.siteID.SiteID; +import ua.in.smartjava.alias.id.siteID.SiteIDEditor; +import ua.in.smartjava.alias.id.status.StatusID; +import ua.in.smartjava.alias.id.status.StatusIDEditor; +import ua.in.smartjava.alias.id.talkgroup.TalkgroupID; +import ua.in.smartjava.alias.id.talkgroup.TalkgroupIDEditor; +import ua.in.smartjava.alias.id.uniqueID.UniqueID; +import ua.in.smartjava.alias.id.uniqueID.UniqueIDEditor; +import ua.in.smartjava.audio.broadcast.BroadcastModel; +import ua.in.smartjava.gui.editor.Editor; +import ua.in.smartjava.gui.editor.EmptyEditor; public class AliasFactory { diff --git a/src/main/java/alias/AliasList.java b/src/main/java/ua/in/smartjava/alias/AliasList.java similarity index 88% rename from src/main/java/alias/AliasList.java rename to src/main/java/ua/in/smartjava/alias/AliasList.java index 44a2b2e9..4b0d582a 100644 --- a/src/main/java/alias/AliasList.java +++ b/src/main/java/ua/in/smartjava/alias/AliasList.java @@ -16,24 +16,24 @@ * along with this program. If not, see * ******************************************************************************/ -package alias; +package ua.in.smartjava.alias; -import alias.id.AliasID; -import alias.id.WildcardID; -import alias.id.esn.Esn; -import alias.id.fleetsync.FleetsyncID; -import alias.id.lojack.LoJackFunctionAndID; -import alias.id.mdc.MDC1200ID; -import alias.id.mobileID.Min; -import alias.id.mpt1327.MPT1327ID; -import alias.id.siteID.SiteID; -import alias.id.status.StatusID; -import alias.id.talkgroup.TalkgroupID; -import alias.id.uniqueID.UniqueID; -import module.decode.lj1200.LJ1200Message.Function; +import ua.in.smartjava.alias.id.AliasID; +import ua.in.smartjava.alias.id.WildcardID; +import ua.in.smartjava.alias.id.esn.Esn; +import ua.in.smartjava.alias.id.fleetsync.FleetsyncID; +import ua.in.smartjava.alias.id.lojack.LoJackFunctionAndID; +import ua.in.smartjava.alias.id.mdc.MDC1200ID; +import ua.in.smartjava.alias.id.mobileID.Min; +import ua.in.smartjava.alias.id.mpt1327.MPT1327ID; +import ua.in.smartjava.alias.id.siteID.SiteID; +import ua.in.smartjava.alias.id.status.StatusID; +import ua.in.smartjava.alias.id.talkgroup.TalkgroupID; +import ua.in.smartjava.alias.id.uniqueID.UniqueID; +import ua.in.smartjava.module.decode.lj1200.LJ1200Message.Function; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import sample.Listener; +import ua.in.smartjava.sample.Listener; import javax.xml.bind.annotation.XmlAttribute; import java.util.ArrayList; @@ -71,9 +71,9 @@ public class AliasList implements Listener /** * List of aliases where all aliases share the same list name. Contains - * several methods for alias lookup from identifier values, like talkgroups. + * several methods for ua.in.smartjava.alias lookup from identifier values, like talkgroups. * - * Responds to alias change events to keep the internal alias list updated. + * Responds to ua.in.smartjava.alias change events to keep the internal ua.in.smartjava.alias list updated. */ public AliasList(String name) { @@ -81,7 +81,7 @@ public class AliasList implements Listener } /** - * Adds the alias to this list + * Adds the ua.in.smartjava.alias to this list */ public void addAlias(Alias alias) { @@ -95,7 +95,7 @@ public class AliasList implements Listener } /** - * Adds the alias and alias identifier to the internal type mapping. + * Adds the ua.in.smartjava.alias and ua.in.smartjava.alias identifier to the internal type mapping. */ private void addAliasID(AliasID id, Alias alias) { @@ -224,13 +224,13 @@ public class AliasList implements Listener } catch(Exception e) { - mLog.error("Couldn't add alias ID " + id + " for alias " + alias); + mLog.error("Couldn't add ua.in.smartjava.alias ID " + id + " for ua.in.smartjava.alias " + alias); } } } /** - * Removes the alias from this list + * Removes the ua.in.smartjava.alias from this list */ public void removeAlias(Alias alias) { @@ -258,7 +258,7 @@ public class AliasList implements Listener } /** - * Removes the alias and alias identifier from internal mappings. + * Removes the ua.in.smartjava.alias and ua.in.smartjava.alias identifier from internal mappings. */ private void removeAliasID(AliasID id, Alias alias) { @@ -393,7 +393,7 @@ public class AliasList implements Listener } /** - * Lookup alias by site ID + * Lookup ua.in.smartjava.alias by site ID */ public Alias getSiteID(String siteID) { @@ -418,7 +418,7 @@ public class AliasList implements Listener } /** - * Lookup alias by status ID + * Lookup ua.in.smartjava.alias by status ID */ public Alias getStatus(int status) { @@ -426,7 +426,7 @@ public class AliasList implements Listener } /** - * Lookup alias by Unique ID (UID) + * Lookup ua.in.smartjava.alias by Unique ID (UID) */ public Alias getUniqueID(int uniqueID) { @@ -434,7 +434,7 @@ public class AliasList implements Listener } /** - * Lookup alias by ESN + * Lookup ua.in.smartjava.alias by ESN */ public Alias getESNAlias(String esn) { @@ -459,7 +459,7 @@ public class AliasList implements Listener } /** - * Lookup alias by fleetsync ID + * Lookup ua.in.smartjava.alias by fleetsync ID */ public Alias getFleetsyncAlias(String ident) { @@ -484,7 +484,7 @@ public class AliasList implements Listener } /** - * Lookup alias by lojack function and ID + * Lookup ua.in.smartjava.alias by lojack function and ID */ public Alias getLoJackAlias(Function function, String id) { @@ -503,7 +503,7 @@ public class AliasList implements Listener } /** - * Lookup alias by MDC1200 ID + * Lookup ua.in.smartjava.alias by MDC1200 ID */ public Alias getMDC1200Alias(String ident) { @@ -528,7 +528,7 @@ public class AliasList implements Listener } /** - * Lookup alias by MPT1327 Ident + * Lookup ua.in.smartjava.alias by MPT1327 Ident */ public Alias getMPT1327Alias(String ident) { @@ -553,7 +553,7 @@ public class AliasList implements Listener } /** - * Lookup alias by Mobile ID Number (MIN) + * Lookup ua.in.smartjava.alias by Mobile ID Number (MIN) */ public Alias getMobileIDNumberAlias(String ident) { @@ -578,10 +578,10 @@ public class AliasList implements Listener } /** - * Lookup alias by talkgroup + * Lookup ua.in.smartjava.alias by talkgroup * - * @param tgid to use when searching for an alias - * @param includeWildcards true if you want to additionally search for a matching alias that contains wildcard(s) + * @param tgid to use when searching for an ua.in.smartjava.alias + * @param includeWildcards true if you want to additionally search for a matching ua.in.smartjava.alias that contains wildcard(s) * when there is not a direct match to the TGID. */ public Alias getTalkgroupAlias(String tgid, boolean includeWildcards) @@ -607,7 +607,7 @@ public class AliasList implements Listener } /** - * Lookup alias by talkgroup. Defaults to matching to wildcard talkgroups. + * Lookup ua.in.smartjava.alias by talkgroup. Defaults to matching to wildcard talkgroups. */ public Alias getTalkgroupAlias(String tgid) { @@ -632,7 +632,7 @@ public class AliasList implements Listener } /** - * Indicates if this alias list has a non-null, non-empty name + * Indicates if this ua.in.smartjava.alias list has a non-null, non-empty name */ private boolean hasName() { @@ -640,7 +640,7 @@ public class AliasList implements Listener } /** - * Receive alias change event notifications and modify this list accordingly + * Receive ua.in.smartjava.alias change event notifications and modify this list accordingly */ @Override public void receive(AliasEvent event) diff --git a/src/main/java/alias/AliasModel.java b/src/main/java/ua/in/smartjava/alias/AliasModel.java similarity index 89% rename from src/main/java/alias/AliasModel.java rename to src/main/java/ua/in/smartjava/alias/AliasModel.java index 1389d299..f0bec2a2 100644 --- a/src/main/java/alias/AliasModel.java +++ b/src/main/java/ua/in/smartjava/alias/AliasModel.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias; +package ua.in.smartjava.alias; -import alias.AliasEvent.Event; -import alias.id.broadcast.BroadcastChannel; -import sample.Broadcaster; -import sample.Listener; +import ua.in.smartjava.alias.AliasEvent.Event; +import ua.in.smartjava.alias.id.broadcast.BroadcastChannel; +import ua.in.smartjava.sample.Broadcaster; +import ua.in.smartjava.sample.Listener; import javax.swing.table.AbstractTableModel; import java.util.ArrayList; @@ -90,7 +90,7 @@ public class AliasModel extends AbstractTableModel mAliasListMap.put(name, aliasList); - //Register the new alias list to receive updates from this model + //Register the new ua.in.smartjava.alias list to receive updates from this model addListener(aliasList); } @@ -98,7 +98,7 @@ public class AliasModel extends AbstractTableModel } /** - * Returns a list of unique alias list names from across the alias set + * Returns a list of unique ua.in.smartjava.alias list names from across the ua.in.smartjava.alias set */ public List getListNames() { @@ -118,7 +118,7 @@ public class AliasModel extends AbstractTableModel } /** - * Returns a list of alias group names for all aliases + * Returns a list of ua.in.smartjava.alias group names for all aliases */ public List getGroupNames() { @@ -138,7 +138,7 @@ public class AliasModel extends AbstractTableModel } /** - * Returns a list of alias group names for all aliases that have a matching + * Returns a list of ua.in.smartjava.alias group names for all aliases that have a matching * list name value */ public List getGroupNames(String listName) @@ -176,7 +176,7 @@ public class AliasModel extends AbstractTableModel } /** - * Adds the alias to the model + * Adds the ua.in.smartjava.alias to the model */ public int addAlias(Alias alias) { @@ -197,7 +197,7 @@ public class AliasModel extends AbstractTableModel } /** - * Removes the channel from the model and broadcasts a channel remove event + * Removes the ua.in.smartjava.channel from the model and broadcasts a ua.in.smartjava.channel remove event */ public void removeAlias(Alias alias) { @@ -217,7 +217,7 @@ public class AliasModel extends AbstractTableModel * Renames any broadcast channels that have the previous name. * * @param previousName to rename - * @param newName to assign to the broadcast channel + * @param newName to assign to the broadcast ua.in.smartjava.channel */ public void renameBroadcastChannel(String previousName, String newName) { @@ -322,7 +322,7 @@ public class AliasModel extends AbstractTableModel { Alias alias = event.getAlias(); - //Validate the alias following a user action that changed the alias or any alias IDs + //Validate the ua.in.smartjava.alias following a user action that changed the ua.in.smartjava.alias or any ua.in.smartjava.alias IDs if(alias != null) { alias.validate(); diff --git a/src/main/java/alias/AliasNameEditor.java b/src/main/java/ua/in/smartjava/alias/AliasNameEditor.java similarity index 95% rename from src/main/java/alias/AliasNameEditor.java rename to src/main/java/ua/in/smartjava/alias/AliasNameEditor.java index 3c205941..d64f3ac2 100644 --- a/src/main/java/alias/AliasNameEditor.java +++ b/src/main/java/ua/in/smartjava/alias/AliasNameEditor.java @@ -16,14 +16,14 @@ * along with this program. If not, see * ******************************************************************************/ -package alias; +package ua.in.smartjava.alias; -import alias.AliasEvent.Event; -import gui.editor.Editor; -import icon.Icon; -import icon.IconListCellRenderer; -import icon.IconManager; -import icon.IconTableModel; +import ua.in.smartjava.alias.AliasEvent.Event; +import ua.in.smartjava.gui.editor.Editor; +import ua.in.smartjava.icon.Icon; +import ua.in.smartjava.icon.IconListCellRenderer; +import ua.in.smartjava.icon.IconManager; +import ua.in.smartjava.icon.IconTableModel; import net.miginfocom.swing.MigLayout; import javax.swing.*; @@ -148,7 +148,7 @@ public class AliasNameEditor extends Editor { Color newColor = JColorChooser.showDialog( AliasNameEditor.this, - "Choose color for this alias", + "Choose color for this ua.in.smartjava.alias", (hasItem() ? getItem().getDisplayColor() : null)); if(newColor != null) @@ -327,7 +327,7 @@ public class AliasNameEditor extends Editor setModified(false); - //Broadcast an alias change event to save the updates + //Broadcast an ua.in.smartjava.alias change event to save the updates mAliasModel.broadcast(new AliasEvent(getItem(), Event.CHANGE)); } } diff --git a/src/main/java/alias/ComponentEditor.java b/src/main/java/ua/in/smartjava/alias/ComponentEditor.java similarity index 94% rename from src/main/java/alias/ComponentEditor.java rename to src/main/java/ua/in/smartjava/alias/ComponentEditor.java index 9cc909bf..8685ec95 100644 --- a/src/main/java/alias/ComponentEditor.java +++ b/src/main/java/ua/in/smartjava/alias/ComponentEditor.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias; +package ua.in.smartjava.alias; import javax.swing.JPanel; import javax.swing.event.DocumentListener; @@ -86,7 +86,7 @@ public abstract class ComponentEditor extends JPanel implements DocumentListe public abstract void save(); /** - * Reloads the editor contents from the source component and resets the + * Reloads the editor contents from the ua.in.smartjava.source component and resets the * modified flag */ public void reset() @@ -96,7 +96,7 @@ public abstract class ComponentEditor extends JPanel implements DocumentListe /** * Validate contents of other editors against this component editor before - * saving. Override this method to allow controller to pass other editors + * saving. Override this method to allow ua.in.smartjava.controller to pass other editors * to this editor for content inspection/validation before indicating that * this editor passes validation. This allows for validating editor contents * that are contingent on settings in other editors. diff --git a/src/main/java/alias/ComponentValidationException.java b/src/main/java/ua/in/smartjava/alias/ComponentValidationException.java similarity index 89% rename from src/main/java/alias/ComponentValidationException.java rename to src/main/java/ua/in/smartjava/alias/ComponentValidationException.java index bfa8d925..1f7fb194 100644 --- a/src/main/java/alias/ComponentValidationException.java +++ b/src/main/java/ua/in/smartjava/alias/ComponentValidationException.java @@ -1,4 +1,4 @@ -package alias; +package ua.in.smartjava.alias; public class ComponentValidationException extends Exception { diff --git a/src/main/java/alias/MultipleAliasEditor.java b/src/main/java/ua/in/smartjava/alias/MultipleAliasEditor.java similarity index 94% rename from src/main/java/alias/MultipleAliasEditor.java rename to src/main/java/ua/in/smartjava/alias/MultipleAliasEditor.java index 796379b4..6f3a1699 100644 --- a/src/main/java/alias/MultipleAliasEditor.java +++ b/src/main/java/ua/in/smartjava/alias/MultipleAliasEditor.java @@ -1,18 +1,18 @@ -package alias; +package ua.in.smartjava.alias; -import alias.AliasEvent.Event; -import alias.id.AliasIDType; -import alias.id.broadcast.BroadcastChannel; -import alias.id.priority.Priority; -import audio.broadcast.BroadcastModel; -import gui.editor.Editor; -import icon.Icon; -import icon.IconListCellRenderer; -import icon.IconManager; +import ua.in.smartjava.alias.AliasEvent.Event; +import ua.in.smartjava.alias.id.AliasIDType; +import ua.in.smartjava.alias.id.broadcast.BroadcastChannel; +import ua.in.smartjava.alias.id.priority.Priority; +import ua.in.smartjava.audio.broadcast.BroadcastModel; +import ua.in.smartjava.gui.editor.Editor; +import ua.in.smartjava.icon.Icon; +import ua.in.smartjava.icon.IconListCellRenderer; +import ua.in.smartjava.icon.IconManager; import net.miginfocom.swing.MigLayout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import sample.Listener; +import ua.in.smartjava.sample.Listener; import javax.swing.*; import javax.swing.event.ChangeEvent; @@ -121,7 +121,7 @@ public class MultipleAliasEditor extends Editor> { Color newColor = JColorChooser.showDialog( MultipleAliasEditor.this, - "Choose color for this alias", null); + "Choose color for this ua.in.smartjava.alias", null); if (newColor != null) { @@ -388,7 +388,7 @@ public class MultipleAliasEditor extends Editor> int priority = mPrioritySlider.getValue(); //This is a work-around -- we use max priority + 1 in the - //gui to indicate do not monitor, and change the value here + //ua.in.smartjava.gui to indicate do not monitor, and change the value here if (priority == Priority.MAX_PRIORITY + 1) { priority = Priority.DO_NOT_MONITOR; @@ -405,7 +405,7 @@ public class MultipleAliasEditor extends Editor> boolean hasChannel = false; - //Ensure the alias doesn't already have the channel + //Ensure the ua.in.smartjava.alias doesn't already have the ua.in.smartjava.channel for(BroadcastChannel channel: alias.getBroadcastChannels()) { if(channel.getChannelName().equals(streamName)) @@ -429,7 +429,7 @@ public class MultipleAliasEditor extends Editor> for (Alias alias : aliases) { - //Broadcast an alias change event to save the updates + //Broadcast an ua.in.smartjava.alias change event to save the updates mAliasModel.broadcast(new AliasEvent(alias, Event.CHANGE)); } } diff --git a/src/main/java/alias/PatchGroupAlias.java b/src/main/java/ua/in/smartjava/alias/PatchGroupAlias.java similarity index 86% rename from src/main/java/alias/PatchGroupAlias.java rename to src/main/java/ua/in/smartjava/alias/PatchGroupAlias.java index bb7e347a..c37cd3eb 100644 --- a/src/main/java/alias/PatchGroupAlias.java +++ b/src/main/java/ua/in/smartjava/alias/PatchGroupAlias.java @@ -16,18 +16,17 @@ * along with this program. If not, see * ******************************************************************************/ -package alias; +package ua.in.smartjava.alias; + +import ua.in.smartjava.alias.action.AliasAction; +import ua.in.smartjava.alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasIDType; +import ua.in.smartjava.alias.id.broadcast.BroadcastChannel; +import ua.in.smartjava.alias.id.priority.Priority; +import ua.in.smartjava.alias.id.talkgroup.TalkgroupID; -import alias.action.AliasAction; -import alias.id.AliasID; -import alias.id.AliasIDType; -import alias.id.broadcast.BroadcastChannel; -import alias.id.priority.Priority; -import alias.id.talkgroup.TalkgroupID; -import gui.SDRTrunk; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import playlist.version1.System; import java.util.ArrayList; import java.util.List; @@ -43,12 +42,12 @@ public class PatchGroupAlias extends Alias private List mPatchedTalkgroupIDs = new ArrayList<>(); /** - * Patch group alias is a single alias for a group of aliases that are temporarily patched together. This will - * normally be used for patched talkgroups, but could be used with any type of alias identifiers that can be + * Patch group ua.in.smartjava.alias is a single ua.in.smartjava.alias for a group of aliases that are temporarily patched together. This will + * normally be used for patched talkgroups, but could be used with any type of ua.in.smartjava.alias identifiers that can be * temporarily joined to form a patch group. * - * Alias properties such as recordable, streamable and call priority are an aggregation from the set of patched - * aliases contained in this patch group alias and the patch group ID alias and where applicable, return the highest + * Alias ua.in.smartjava.properties such as recordable, streamable and call priority are an aggregation from the set of patched + * aliases contained in this patch group ua.in.smartjava.alias and the patch group ID ua.in.smartjava.alias and where applicable, return the highest * value/priority from the group of patched aliases. */ public PatchGroupAlias() @@ -67,7 +66,7 @@ public class PatchGroupAlias extends Alias } /** - * Sets an alias for this patch group ID + * Sets an ua.in.smartjava.alias for this patch group ID */ public void setPatchGroupAlias(Alias alias) { @@ -83,7 +82,7 @@ public class PatchGroupAlias extends Alias } /** - * Indicates if this patch group has an alias + * Indicates if this patch group has an ua.in.smartjava.alias */ public boolean hasPatchGroupAlias() { @@ -99,7 +98,7 @@ public class PatchGroupAlias extends Alias } /** - * Removes/clears all patched aliases from this patch alias group + * Removes/clears all patched aliases from this patch ua.in.smartjava.alias group */ public void clearPatchedAliases() { @@ -107,20 +106,20 @@ public class PatchGroupAlias extends Alias } /** - * Adds the patched alias to this patch alias group + * Adds the patched ua.in.smartjava.alias to this patch ua.in.smartjava.alias group */ public void addPatchedAlias(Alias alias) { if(alias == PatchGroupAlias.this) { - throw new IllegalArgumentException("Can't add patch group alias to itself - would create an infinite loop"); + throw new IllegalArgumentException("Can't add patch group ua.in.smartjava.alias to itself - would create an infinite loop"); } mPatchedAliases.add(alias); } /** - * Removes the patched alias from this patch alias group + * Removes the patched ua.in.smartjava.alias from this patch ua.in.smartjava.alias group */ public void removePatchedAlias(Alias alias) { @@ -206,7 +205,7 @@ public class PatchGroupAlias extends Alias } /** - * Returns the highest listenable audio priority defined among the aliases in the group, or returns 'Do Not Monitor' + * Returns the highest listenable ua.in.smartjava.audio priority defined among the aliases in the group, or returns 'Do Not Monitor' * if that is the only priority defined. Otherwise, returns default (100) priority. */ @Override diff --git a/src/main/java/alias/action/AliasAction.java b/src/main/java/ua/in/smartjava/alias/action/AliasAction.java similarity index 65% rename from src/main/java/alias/action/AliasAction.java rename to src/main/java/ua/in/smartjava/alias/action/AliasAction.java index c353da28..d145105b 100644 --- a/src/main/java/alias/action/AliasAction.java +++ b/src/main/java/ua/in/smartjava/alias/action/AliasAction.java @@ -16,13 +16,13 @@ * along with this program. If not, see * ******************************************************************************/ -package alias.action; +package ua.in.smartjava.alias.action; -import alias.Alias; -import alias.action.beep.BeepAction; -import alias.action.clip.ClipAction; -import alias.action.script.ScriptAction; -import message.Message; +import ua.in.smartjava.alias.Alias; +import ua.in.smartjava.alias.action.beep.BeepAction; +import ua.in.smartjava.alias.action.clip.ClipAction; +import ua.in.smartjava.alias.action.script.ScriptAction; +import ua.in.smartjava.message.Message; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; @@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlTransient; import java.util.concurrent.ScheduledExecutorService; /** - * Alias action defines an action to execute when an alias is detected active. + * Alias action defines an action to execute when an ua.in.smartjava.alias is detected active. */ @XmlSeeAlso( { BeepAction.class, ClipAction.class, ScriptAction.class } ) @XmlRootElement( name = "action" ) @@ -44,15 +44,15 @@ public abstract class AliasAction public abstract AliasActionType getType(); /** - * Task to execute when an alias action is defined. The message argument is - * the original message containing one or more aliases that have an alias - * action attached. The alias argument is the parent alias containing the - * alias action. + * Task to execute when an ua.in.smartjava.alias action is defined. The ua.in.smartjava.message argument is + * the original ua.in.smartjava.message containing one or more aliases that have an ua.in.smartjava.alias + * action attached. The ua.in.smartjava.alias argument is the parent ua.in.smartjava.alias containing the + * ua.in.smartjava.alias action. */ public abstract void execute( ScheduledExecutorService scheduledExecutorService, Alias alias, Message message ); /** - * Dismiss a persistent alias action + * Dismiss a persistent ua.in.smartjava.alias action */ public abstract void dismiss( boolean reset ); } diff --git a/src/main/java/alias/action/AliasActionEditor.java b/src/main/java/ua/in/smartjava/alias/action/AliasActionEditor.java similarity index 96% rename from src/main/java/alias/action/AliasActionEditor.java rename to src/main/java/ua/in/smartjava/alias/action/AliasActionEditor.java index f4d41aa9..ec339d22 100644 --- a/src/main/java/alias/action/AliasActionEditor.java +++ b/src/main/java/ua/in/smartjava/alias/action/AliasActionEditor.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.action; +package ua.in.smartjava.alias.action; -import gui.editor.Editor; -import gui.editor.EmptyEditor; +import ua.in.smartjava.gui.editor.Editor; +import ua.in.smartjava.gui.editor.EmptyEditor; import java.awt.EventQueue; import java.awt.event.ActionEvent; @@ -43,11 +43,11 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import net.miginfocom.swing.MigLayout; -import alias.Alias; -import alias.AliasEvent; -import alias.AliasEvent.Event; -import alias.AliasFactory; -import alias.AliasModel; +import ua.in.smartjava.alias.Alias; +import ua.in.smartjava.alias.AliasEvent; +import ua.in.smartjava.alias.AliasEvent.Event; +import ua.in.smartjava.alias.AliasFactory; +import ua.in.smartjava.alias.AliasModel; public class AliasActionEditor extends Editor { @@ -277,7 +277,7 @@ public class AliasActionEditor extends Editor { int option = JOptionPane.showConfirmDialog( EditorContainer.this, - "Action settings have changed. Do you want to save these changes?", + "Action settings have changed. Do you want to save these changes?", "Save Changes?", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE ); diff --git a/src/main/java/alias/action/AliasActionListener.java b/src/main/java/ua/in/smartjava/alias/action/AliasActionListener.java similarity index 77% rename from src/main/java/alias/action/AliasActionListener.java rename to src/main/java/ua/in/smartjava/alias/action/AliasActionListener.java index a967e446..25ed8456 100644 --- a/src/main/java/alias/action/AliasActionListener.java +++ b/src/main/java/ua/in/smartjava/alias/action/AliasActionListener.java @@ -15,18 +15,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.action; +package ua.in.smartjava.alias.action; -import alias.AliasEvent; +import ua.in.smartjava.alias.AliasEvent; /** - * Interface for receiving alias events. Each listener will receive - * notification of all alias events. + * Interface for receiving ua.in.smartjava.alias events. Each listener will receive + * notification of all ua.in.smartjava.alias events. */ public interface AliasActionListener { /** - * Notifies the listener that an alias event has occurred + * Notifies the listener that an ua.in.smartjava.alias event has occurred */ public void aliasChanged( AliasEvent event ); } diff --git a/src/main/java/alias/action/AliasActionManager.java b/src/main/java/ua/in/smartjava/alias/action/AliasActionManager.java similarity index 69% rename from src/main/java/alias/action/AliasActionManager.java rename to src/main/java/ua/in/smartjava/alias/action/AliasActionManager.java index 0ba644d1..84cc66aa 100644 --- a/src/main/java/alias/action/AliasActionManager.java +++ b/src/main/java/ua/in/smartjava/alias/action/AliasActionManager.java @@ -16,21 +16,21 @@ * along with this program. If not, see * ******************************************************************************/ -package alias.action; +package ua.in.smartjava.alias.action; -import alias.Alias; -import message.Message; -import sample.Listener; -import util.ThreadPool; +import ua.in.smartjava.alias.Alias; +import ua.in.smartjava.message.Message; +import ua.in.smartjava.sample.Listener; +import ua.in.smartjava.util.ThreadPool; import java.util.List; /** - * Manages all alias action events. Each received message is interrogated for - * any alias entries and then each alias is interrogated for any alias actions. + * Manages all ua.in.smartjava.alias action events. Each received ua.in.smartjava.message is interrogated for + * any ua.in.smartjava.alias entries and then each ua.in.smartjava.alias is interrogated for any ua.in.smartjava.alias actions. * - * Each alias action is executed and provided a copy of the source message so - * that the contents of the message can be used as part of the action. + * Each ua.in.smartjava.alias action is executed and provided a copy of the ua.in.smartjava.source ua.in.smartjava.message so + * that the contents of the ua.in.smartjava.message can be used as part of the action. */ public class AliasActionManager implements Listener { @@ -57,8 +57,8 @@ public class AliasActionManager implements Listener { /* Provide access to the thread pool manager in case the * action needs to setup a timer, and provide the original - * message to be used as part of the action (e.g. sending - * the message as a text message to a cell phone */ + * ua.in.smartjava.message to be used as part of the action (e.g. sending + * the ua.in.smartjava.message as a text ua.in.smartjava.message to a cell phone */ action.execute(ThreadPool.SCHEDULED, alias, message); } } diff --git a/src/main/java/alias/action/AliasActionType.java b/src/main/java/ua/in/smartjava/alias/action/AliasActionType.java similarity index 96% rename from src/main/java/alias/action/AliasActionType.java rename to src/main/java/ua/in/smartjava/alias/action/AliasActionType.java index b54ddb06..53848ca5 100644 --- a/src/main/java/alias/action/AliasActionType.java +++ b/src/main/java/ua/in/smartjava/alias/action/AliasActionType.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.action; +package ua.in.smartjava.alias.action; public enum AliasActionType { diff --git a/src/main/java/alias/action/RecurringAction.java b/src/main/java/ua/in/smartjava/alias/action/RecurringAction.java similarity index 96% rename from src/main/java/alias/action/RecurringAction.java rename to src/main/java/ua/in/smartjava/alias/action/RecurringAction.java index c8e54d62..1eed40bd 100644 --- a/src/main/java/alias/action/RecurringAction.java +++ b/src/main/java/ua/in/smartjava/alias/action/RecurringAction.java @@ -1,7 +1,7 @@ -package alias.action; +package ua.in.smartjava.alias.action; -import alias.Alias; -import message.Message; +import ua.in.smartjava.alias.Alias; +import ua.in.smartjava.message.Message; import javax.swing.*; import javax.xml.bind.annotation.XmlAttribute; @@ -50,7 +50,7 @@ public abstract class RecurringAction extends AliasAction StringBuilder sb = new StringBuilder(); sb.append("
Alias ["); sb.append(alias.getName()); - sb.append("] is active in message ["); + sb.append("] is active in ua.in.smartjava.message ["); sb.append(message.toString()); sb.append("]
"); diff --git a/src/main/java/alias/action/beep/BeepAction.java b/src/main/java/ua/in/smartjava/alias/action/beep/BeepAction.java similarity index 57% rename from src/main/java/alias/action/beep/BeepAction.java rename to src/main/java/ua/in/smartjava/alias/action/beep/BeepAction.java index 65ebd2bd..2a59656e 100644 --- a/src/main/java/alias/action/beep/BeepAction.java +++ b/src/main/java/ua/in/smartjava/alias/action/beep/BeepAction.java @@ -1,9 +1,9 @@ -package alias.action.beep; +package ua.in.smartjava.alias.action.beep; -import message.Message; -import alias.Alias; -import alias.action.AliasActionType; -import alias.action.RecurringAction; +import ua.in.smartjava.message.Message; +import ua.in.smartjava.alias.Alias; +import ua.in.smartjava.alias.action.AliasActionType; +import ua.in.smartjava.alias.action.RecurringAction; public class BeepAction extends RecurringAction { diff --git a/src/main/java/alias/action/beep/BeepActionEditor.java b/src/main/java/ua/in/smartjava/alias/action/beep/BeepActionEditor.java similarity index 93% rename from src/main/java/alias/action/beep/BeepActionEditor.java rename to src/main/java/ua/in/smartjava/alias/action/beep/BeepActionEditor.java index 1f47f9aa..21c86fbf 100644 --- a/src/main/java/alias/action/beep/BeepActionEditor.java +++ b/src/main/java/ua/in/smartjava/alias/action/beep/BeepActionEditor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.action.beep; +package ua.in.smartjava.alias.action.beep; -import gui.editor.DocumentListenerEditor; +import ua.in.smartjava.gui.editor.DocumentListenerEditor; import java.awt.Color; import java.awt.Cursor; @@ -36,8 +36,8 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import net.miginfocom.swing.MigLayout; -import alias.action.AliasAction; -import alias.action.RecurringAction.Interval; +import ua.in.smartjava.alias.action.AliasAction; +import ua.in.smartjava.alias.action.RecurringAction.Interval; public class BeepActionEditor extends DocumentListenerEditor { @@ -47,11 +47,11 @@ public class BeepActionEditor extends DocumentListenerEditor "

Beep Action

" + "This action will sound a beep according to the interval
" + "that you select:

" - + "Once: Beep the first time the alias is active and
" + + "Once: Beep the first time the ua.in.smartjava.alias is active and
" + "never again

" + "Once, Reset After Delay: Beep once and suppress
" + "subsequent beeps for the specified period in seconds.
" - + "After the reset period, beep again when the alias is active.

" + + "After the reset period, beep again when the ua.in.smartjava.alias is active.

" + "Until Dismissed: Beep every period seconds until you
" + "click OK on the dialog that appears. Alerting is suppressed
" + "for 15 seconds after you click OK.
" diff --git a/src/main/java/alias/action/clip/ClipAction.java b/src/main/java/ua/in/smartjava/alias/action/clip/ClipAction.java similarity index 84% rename from src/main/java/alias/action/clip/ClipAction.java rename to src/main/java/ua/in/smartjava/alias/action/clip/ClipAction.java index dd338d96..86e57fc4 100644 --- a/src/main/java/alias/action/clip/ClipAction.java +++ b/src/main/java/ua/in/smartjava/alias/action/clip/ClipAction.java @@ -1,4 +1,4 @@ -package alias.action.clip; +package ua.in.smartjava.alias.action.clip; import java.io.File; @@ -7,14 +7,14 @@ import javax.sound.sampled.AudioSystem; import javax.sound.sampled.Clip; import javax.xml.bind.annotation.XmlTransient; -import message.Message; +import ua.in.smartjava.message.Message; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import alias.Alias; -import alias.action.AliasActionType; -import alias.action.RecurringAction; +import ua.in.smartjava.alias.Alias; +import ua.in.smartjava.alias.action.AliasActionType; +import ua.in.smartjava.alias.action.RecurringAction; public class ClipAction extends RecurringAction { @@ -54,7 +54,7 @@ public class ClipAction extends RecurringAction } catch( Exception e ) { - mLog.error( "Couldn't play audio clip", e ); + mLog.error( "Couldn't play ua.in.smartjava.audio clip", e ); } } diff --git a/src/main/java/alias/action/clip/ClipActionEditor.java b/src/main/java/ua/in/smartjava/alias/action/clip/ClipActionEditor.java similarity index 92% rename from src/main/java/alias/action/clip/ClipActionEditor.java rename to src/main/java/ua/in/smartjava/alias/action/clip/ClipActionEditor.java index 83b09cc2..8252a4b9 100644 --- a/src/main/java/alias/action/clip/ClipActionEditor.java +++ b/src/main/java/ua/in/smartjava/alias/action/clip/ClipActionEditor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.action.clip; +package ua.in.smartjava.alias.action.clip; -import gui.editor.DocumentListenerEditor; +import ua.in.smartjava.gui.editor.DocumentListenerEditor; import java.awt.Color; import java.awt.Cursor; @@ -40,8 +40,8 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import net.miginfocom.swing.MigLayout; -import alias.action.AliasAction; -import alias.action.RecurringAction.Interval; +import ua.in.smartjava.alias.action.AliasAction; +import ua.in.smartjava.alias.action.RecurringAction.Interval; public class ClipActionEditor extends DocumentListenerEditor { @@ -50,13 +50,13 @@ public class ClipActionEditor extends DocumentListenerEditor private static final String PLEASE_SELECT_A_FILE = "Please select a file"; private static final String HELP_TEXT = "

Clip Action

" - + "This action will play an audio clip according to the interval
" + + "This action will play an ua.in.smartjava.audio clip according to the interval
" + "that you select:

" - + "Once: play the first time the alias is active and
" + + "Once: play the first time the ua.in.smartjava.alias is active and
" + "never again

" + "Once, Reset After Delay: play once and suppress
" + "subsequent runs for the specified period in seconds.
" - + "After the reset period, play again when the alias is active.

" + + "After the reset period, play again when the ua.in.smartjava.alias is active.

" + "Until Dismissed: play every period seconds until you
" + "click OK on the dialog that appears. Alerting is suppressed
" + "for 15 seconds after you click OK.
" @@ -186,7 +186,7 @@ public class ClipActionEditor extends DocumentListenerEditor if( path == null || path.trim().isEmpty() ) { JOptionPane.showMessageDialog( ClipActionEditor.this, - "Please select an audio file", PLEASE_SELECT_A_FILE, + "Please select an ua.in.smartjava.audio file", PLEASE_SELECT_A_FILE, JOptionPane.ERROR_MESSAGE ); } else @@ -218,7 +218,7 @@ public class ClipActionEditor extends DocumentListenerEditor catch( Exception e1 ) { JOptionPane.showMessageDialog( ClipActionEditor.this, - "Couldn't play audio clip [" + e1.getMessage() + "]", + "Couldn't play ua.in.smartjava.audio clip [" + e1.getMessage() + "]", "Error", JOptionPane.ERROR_MESSAGE ); } } diff --git a/src/main/java/alias/action/script/ScriptAction.java b/src/main/java/ua/in/smartjava/alias/action/script/ScriptAction.java similarity index 87% rename from src/main/java/alias/action/script/ScriptAction.java rename to src/main/java/ua/in/smartjava/alias/action/script/ScriptAction.java index 8dcfb55f..cfc1a21e 100644 --- a/src/main/java/alias/action/script/ScriptAction.java +++ b/src/main/java/ua/in/smartjava/alias/action/script/ScriptAction.java @@ -1,16 +1,16 @@ -package alias.action.script; +package ua.in.smartjava.alias.action.script; import java.io.BufferedReader; import java.io.InputStreamReader; -import message.Message; +import ua.in.smartjava.message.Message; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import alias.Alias; -import alias.action.AliasActionType; -import alias.action.RecurringAction; +import ua.in.smartjava.alias.Alias; +import ua.in.smartjava.alias.action.AliasActionType; +import ua.in.smartjava.alias.action.RecurringAction; public class ScriptAction extends RecurringAction { diff --git a/src/main/java/alias/action/script/ScriptActionEditor.java b/src/main/java/ua/in/smartjava/alias/action/script/ScriptActionEditor.java similarity index 95% rename from src/main/java/alias/action/script/ScriptActionEditor.java rename to src/main/java/ua/in/smartjava/alias/action/script/ScriptActionEditor.java index a0593e42..1399a480 100644 --- a/src/main/java/alias/action/script/ScriptActionEditor.java +++ b/src/main/java/ua/in/smartjava/alias/action/script/ScriptActionEditor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.action.script; +package ua.in.smartjava.alias.action.script; -import gui.editor.DocumentListenerEditor; +import ua.in.smartjava.gui.editor.DocumentListenerEditor; import java.awt.Color; import java.awt.Cursor; @@ -40,8 +40,8 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import net.miginfocom.swing.MigLayout; -import alias.action.AliasAction; -import alias.action.RecurringAction.Interval; +import ua.in.smartjava.alias.action.AliasAction; +import ua.in.smartjava.alias.action.RecurringAction.Interval; public class ScriptActionEditor extends DocumentListenerEditor { @@ -52,11 +52,11 @@ public class ScriptActionEditor extends DocumentListenerEditor "

Script Action

" + "This action will run a script according to the interval
" + "that you select:

" - + "Once: run the first time the alias is active and
" + + "Once: run the first time the ua.in.smartjava.alias is active and
" + "never again

" + "Once, Reset After Delay: run once and suppress
" + "subsequent runs for the specified period in seconds.
" - + "After the reset period, run again when the alias is active.

" + + "After the reset period, run again when the ua.in.smartjava.alias is active.

" + "Until Dismissed: run every period seconds until you
" + "click OK on the dialog that appears. Alerting is suppressed
" + "for 15 seconds after you click OK.
" diff --git a/src/main/java/alias/id/AliasID.java b/src/main/java/ua/in/smartjava/alias/id/AliasID.java similarity index 69% rename from src/main/java/alias/id/AliasID.java rename to src/main/java/ua/in/smartjava/alias/id/AliasID.java index 25eff7d5..6a8c4480 100644 --- a/src/main/java/alias/id/AliasID.java +++ b/src/main/java/ua/in/smartjava/alias/id/AliasID.java @@ -15,26 +15,26 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id; +package ua.in.smartjava.alias.id; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlTransient; -import alias.id.broadcast.BroadcastChannel; +import ua.in.smartjava.alias.id.broadcast.BroadcastChannel; import playlist.version1.Group; -import alias.id.esn.Esn; -import alias.id.fleetsync.FleetsyncID; -import alias.id.lojack.LoJackFunctionAndID; -import alias.id.mdc.MDC1200ID; -import alias.id.mobileID.Min; -import alias.id.mpt1327.MPT1327ID; -import alias.id.nonrecordable.NonRecordable; -import alias.id.priority.Priority; -import alias.id.siteID.SiteID; -import alias.id.status.StatusID; -import alias.id.talkgroup.TalkgroupID; -import alias.id.uniqueID.UniqueID; +import ua.in.smartjava.alias.id.esn.Esn; +import ua.in.smartjava.alias.id.fleetsync.FleetsyncID; +import ua.in.smartjava.alias.id.lojack.LoJackFunctionAndID; +import ua.in.smartjava.alias.id.mdc.MDC1200ID; +import ua.in.smartjava.alias.id.mobileID.Min; +import ua.in.smartjava.alias.id.mpt1327.MPT1327ID; +import ua.in.smartjava.alias.id.nonrecordable.NonRecordable; +import ua.in.smartjava.alias.id.priority.Priority; +import ua.in.smartjava.alias.id.siteID.SiteID; +import ua.in.smartjava.alias.id.status.StatusID; +import ua.in.smartjava.alias.id.talkgroup.TalkgroupID; +import ua.in.smartjava.alias.id.uniqueID.UniqueID; @SuppressWarnings( "deprecation" ) @XmlSeeAlso( {BroadcastChannel.class, Esn.class, FleetsyncID.class, Group.class, LoJackFunctionAndID.class, diff --git a/src/main/java/alias/id/AliasIDType.java b/src/main/java/ua/in/smartjava/alias/id/AliasIDType.java similarity index 97% rename from src/main/java/alias/id/AliasIDType.java rename to src/main/java/ua/in/smartjava/alias/id/AliasIDType.java index 6a71ff4f..a646829f 100644 --- a/src/main/java/alias/id/AliasIDType.java +++ b/src/main/java/ua/in/smartjava/alias/id/AliasIDType.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id; +package ua.in.smartjava.alias.id; public enum AliasIDType { diff --git a/src/main/java/alias/id/AliasIdentifierEditor.java b/src/main/java/ua/in/smartjava/alias/id/AliasIdentifierEditor.java similarity index 95% rename from src/main/java/alias/id/AliasIdentifierEditor.java rename to src/main/java/ua/in/smartjava/alias/id/AliasIdentifierEditor.java index 0c20517d..dbc38e8f 100644 --- a/src/main/java/alias/id/AliasIdentifierEditor.java +++ b/src/main/java/ua/in/smartjava/alias/id/AliasIdentifierEditor.java @@ -15,11 +15,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id; +package ua.in.smartjava.alias.id; -import audio.broadcast.BroadcastModel; -import gui.editor.Editor; -import gui.editor.EmptyEditor; +import ua.in.smartjava.audio.broadcast.BroadcastModel; +import ua.in.smartjava.gui.editor.Editor; +import ua.in.smartjava.gui.editor.EmptyEditor; import java.awt.EventQueue; import java.awt.event.ActionEvent; @@ -44,11 +44,11 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import net.miginfocom.swing.MigLayout; -import alias.Alias; -import alias.AliasEvent; -import alias.AliasEvent.Event; -import alias.AliasFactory; -import alias.AliasModel; +import ua.in.smartjava.alias.Alias; +import ua.in.smartjava.alias.AliasEvent; +import ua.in.smartjava.alias.AliasEvent.Event; +import ua.in.smartjava.alias.AliasFactory; +import ua.in.smartjava.alias.AliasModel; public class AliasIdentifierEditor extends Editor { @@ -307,7 +307,7 @@ public class AliasIdentifierEditor extends Editor { int option = JOptionPane.showConfirmDialog( EditorContainer.this, - "Identifier settings have changed. Do you want to save these changes?", + "Identifier settings have changed. Do you want to save these changes?", "Save Changes?", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE ); diff --git a/src/main/java/alias/id/WildcardID.java b/src/main/java/ua/in/smartjava/alias/id/WildcardID.java similarity index 96% rename from src/main/java/alias/id/WildcardID.java rename to src/main/java/ua/in/smartjava/alias/id/WildcardID.java index c5f47086..01ad15f0 100644 --- a/src/main/java/alias/id/WildcardID.java +++ b/src/main/java/ua/in/smartjava/alias/id/WildcardID.java @@ -16,7 +16,7 @@ * along with this program. If not, see * ******************************************************************************/ -package alias.id; +package ua.in.smartjava.alias.id; import org.apache.commons.lang3.Validate; @@ -57,7 +57,7 @@ public class WildcardID implements Comparable } catch(Exception e) { - throw new IllegalArgumentException("Invalid regex pattern for alias ID value [" + value + "]", e); + throw new IllegalArgumentException("Invalid regex pattern for ua.in.smartjava.alias ID value [" + value + "]", e); } mWeight = calculateWeight(); @@ -69,7 +69,7 @@ public class WildcardID implements Comparable } /** - * Indicates if the id matches the internal regex pattern for this wildcard alias ID + * Indicates if the id matches the internal regex pattern for this wildcard ua.in.smartjava.alias ID * @param id * @return */ diff --git a/src/main/java/alias/id/broadcast/BroadcastChannel.java b/src/main/java/ua/in/smartjava/alias/id/broadcast/BroadcastChannel.java similarity index 87% rename from src/main/java/alias/id/broadcast/BroadcastChannel.java rename to src/main/java/ua/in/smartjava/alias/id/broadcast/BroadcastChannel.java index 59a32090..900403bb 100644 --- a/src/main/java/alias/id/broadcast/BroadcastChannel.java +++ b/src/main/java/ua/in/smartjava/alias/id/broadcast/BroadcastChannel.java @@ -16,10 +16,10 @@ * along with this program. If not, see * ******************************************************************************/ -package alias.id.broadcast; +package ua.in.smartjava.alias.id.broadcast; -import alias.id.AliasID; -import alias.id.AliasIDType; +import ua.in.smartjava.alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasIDType; import javax.xml.bind.annotation.XmlAttribute; @@ -73,7 +73,7 @@ public class BroadcastChannel extends AliasID implements Comparable * ******************************************************************************/ -package alias.id.broadcast; +package ua.in.smartjava.alias.id.broadcast; -import alias.id.AliasID; -import audio.broadcast.BroadcastConfiguration; -import audio.broadcast.BroadcastModel; -import gui.editor.DocumentListenerEditor; +import ua.in.smartjava.alias.id.AliasID; +import ua.in.smartjava.audio.broadcast.BroadcastConfiguration; +import ua.in.smartjava.audio.broadcast.BroadcastModel; +import ua.in.smartjava.gui.editor.DocumentListenerEditor; import net.miginfocom.swing.MigLayout; import javax.swing.*; @@ -38,8 +38,8 @@ public class BroadcastChannelEditor extends DocumentListenerEditor private static final String HELP_TEXT = "" + "

Audio Broadcast Channel

" - + "Name of a audio streaming broadcast configuration
" - + "to be used for streaming audio to an external
" + + "Name of a ua.in.smartjava.audio streaming broadcast configuration
" + + "to be used for streaming ua.in.smartjava.audio to an external
" + "streaming server"; private JComboBox mBroadcastConfigurations; diff --git a/src/main/java/alias/id/esn/ESNEditor.java b/src/main/java/ua/in/smartjava/alias/id/esn/ESNEditor.java similarity index 95% rename from src/main/java/alias/id/esn/ESNEditor.java rename to src/main/java/ua/in/smartjava/alias/id/esn/ESNEditor.java index fd36ed47..c58ccadb 100644 --- a/src/main/java/alias/id/esn/ESNEditor.java +++ b/src/main/java/ua/in/smartjava/alias/id/esn/ESNEditor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.esn; +package ua.in.smartjava.alias.id.esn; -import gui.editor.DocumentListenerEditor; +import ua.in.smartjava.gui.editor.DocumentListenerEditor; import java.awt.Color; import java.awt.Cursor; @@ -29,7 +29,7 @@ import javax.swing.JOptionPane; import javax.swing.JTextField; import net.miginfocom.swing.MigLayout; -import alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasID; public class ESNEditor extends DocumentListenerEditor { diff --git a/src/main/java/alias/id/esn/Esn.java b/src/main/java/ua/in/smartjava/alias/id/esn/Esn.java similarity index 93% rename from src/main/java/alias/id/esn/Esn.java rename to src/main/java/ua/in/smartjava/alias/id/esn/Esn.java index 5e2b5fc1..89ab16b1 100644 --- a/src/main/java/alias/id/esn/Esn.java +++ b/src/main/java/ua/in/smartjava/alias/id/esn/Esn.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.esn; +package ua.in.smartjava.alias.id.esn; import javax.xml.bind.annotation.XmlAttribute; -import alias.id.AliasID; -import alias.id.AliasIDType; +import ua.in.smartjava.alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasIDType; public class Esn extends AliasID { diff --git a/src/main/java/alias/id/fleetsync/FleetsyncID.java b/src/main/java/ua/in/smartjava/alias/id/fleetsync/FleetsyncID.java similarity index 93% rename from src/main/java/alias/id/fleetsync/FleetsyncID.java rename to src/main/java/ua/in/smartjava/alias/id/fleetsync/FleetsyncID.java index 22b00872..bf29e3fc 100644 --- a/src/main/java/alias/id/fleetsync/FleetsyncID.java +++ b/src/main/java/ua/in/smartjava/alias/id/fleetsync/FleetsyncID.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.fleetsync; +package ua.in.smartjava.alias.id.fleetsync; import javax.xml.bind.annotation.XmlAttribute; -import alias.id.AliasID; -import alias.id.AliasIDType; +import ua.in.smartjava.alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasIDType; public class FleetsyncID extends AliasID diff --git a/src/main/java/alias/id/fleetsync/FleetsyncIDEditor.java b/src/main/java/ua/in/smartjava/alias/id/fleetsync/FleetsyncIDEditor.java similarity index 96% rename from src/main/java/alias/id/fleetsync/FleetsyncIDEditor.java rename to src/main/java/ua/in/smartjava/alias/id/fleetsync/FleetsyncIDEditor.java index 64f8f531..5283f35f 100644 --- a/src/main/java/alias/id/fleetsync/FleetsyncIDEditor.java +++ b/src/main/java/ua/in/smartjava/alias/id/fleetsync/FleetsyncIDEditor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.fleetsync; +package ua.in.smartjava.alias.id.fleetsync; -import gui.editor.DocumentListenerEditor; +import ua.in.smartjava.gui.editor.DocumentListenerEditor; import java.awt.Color; import java.awt.Cursor; @@ -35,7 +35,7 @@ import net.miginfocom.swing.MigLayout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasID; public class FleetsyncIDEditor extends DocumentListenerEditor { diff --git a/src/main/java/alias/id/lojack/LoJackFunctionAndID.java b/src/main/java/ua/in/smartjava/alias/id/lojack/LoJackFunctionAndID.java similarity index 90% rename from src/main/java/alias/id/lojack/LoJackFunctionAndID.java rename to src/main/java/ua/in/smartjava/alias/id/lojack/LoJackFunctionAndID.java index f2cc8c80..2fa5f0bd 100644 --- a/src/main/java/alias/id/lojack/LoJackFunctionAndID.java +++ b/src/main/java/ua/in/smartjava/alias/id/lojack/LoJackFunctionAndID.java @@ -15,14 +15,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.lojack; +package ua.in.smartjava.alias.id.lojack; import javax.xml.bind.annotation.XmlAttribute; -import module.decode.lj1200.LJ1200Message; -import module.decode.lj1200.LJ1200Message.Function; -import alias.id.AliasID; -import alias.id.AliasIDType; +import ua.in.smartjava.module.decode.lj1200.LJ1200Message; +import ua.in.smartjava.module.decode.lj1200.LJ1200Message.Function; +import ua.in.smartjava.alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasIDType; public class LoJackFunctionAndID extends AliasID { @@ -67,7 +67,7 @@ public class LoJackFunctionAndID extends AliasID } /** - * Indicates if the function and id combination match this alias id + * Indicates if the function and id combination match this ua.in.smartjava.alias id */ public boolean matches( Function function, String id ) { diff --git a/src/main/java/alias/id/lojack/LoJackIDEditor.java b/src/main/java/ua/in/smartjava/alias/id/lojack/LoJackIDEditor.java similarity index 94% rename from src/main/java/alias/id/lojack/LoJackIDEditor.java rename to src/main/java/ua/in/smartjava/alias/id/lojack/LoJackIDEditor.java index 8c13e60e..45cad800 100644 --- a/src/main/java/alias/id/lojack/LoJackIDEditor.java +++ b/src/main/java/ua/in/smartjava/alias/id/lojack/LoJackIDEditor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.lojack; +package ua.in.smartjava.alias.id.lojack; -import gui.editor.DocumentListenerEditor; +import ua.in.smartjava.gui.editor.DocumentListenerEditor; import java.awt.Color; import java.awt.Cursor; @@ -33,10 +33,10 @@ import javax.swing.JOptionPane; import javax.swing.JTextField; import javax.swing.text.MaskFormatter; -import module.decode.lj1200.LJ1200Message; -import module.decode.lj1200.LJ1200Message.Function; +import ua.in.smartjava.module.decode.lj1200.LJ1200Message; +import ua.in.smartjava.module.decode.lj1200.LJ1200Message.Function; import net.miginfocom.swing.MigLayout; -import alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasID; public class LoJackIDEditor extends DocumentListenerEditor { diff --git a/src/main/java/alias/id/mdc/MDC1200ID.java b/src/main/java/ua/in/smartjava/alias/id/mdc/MDC1200ID.java similarity index 93% rename from src/main/java/alias/id/mdc/MDC1200ID.java rename to src/main/java/ua/in/smartjava/alias/id/mdc/MDC1200ID.java index 731b1153..85580ab7 100644 --- a/src/main/java/alias/id/mdc/MDC1200ID.java +++ b/src/main/java/ua/in/smartjava/alias/id/mdc/MDC1200ID.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.mdc; +package ua.in.smartjava.alias.id.mdc; import javax.xml.bind.annotation.XmlAttribute; -import alias.id.AliasID; -import alias.id.AliasIDType; +import ua.in.smartjava.alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasIDType; public class MDC1200ID extends AliasID diff --git a/src/main/java/alias/id/mdc/MDC1200IDEditor.java b/src/main/java/ua/in/smartjava/alias/id/mdc/MDC1200IDEditor.java similarity index 95% rename from src/main/java/alias/id/mdc/MDC1200IDEditor.java rename to src/main/java/ua/in/smartjava/alias/id/mdc/MDC1200IDEditor.java index 21437cb9..b06aa01a 100644 --- a/src/main/java/alias/id/mdc/MDC1200IDEditor.java +++ b/src/main/java/ua/in/smartjava/alias/id/mdc/MDC1200IDEditor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.mdc; +package ua.in.smartjava.alias.id.mdc; -import gui.editor.DocumentListenerEditor; +import ua.in.smartjava.gui.editor.DocumentListenerEditor; import java.awt.Color; import java.awt.Cursor; @@ -31,7 +31,7 @@ import javax.swing.JTextField; import javax.swing.text.MaskFormatter; import net.miginfocom.swing.MigLayout; -import alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasID; public class MDC1200IDEditor extends DocumentListenerEditor { diff --git a/src/main/java/alias/id/mobileID/MINEditor.java b/src/main/java/ua/in/smartjava/alias/id/mobileID/MINEditor.java similarity index 95% rename from src/main/java/alias/id/mobileID/MINEditor.java rename to src/main/java/ua/in/smartjava/alias/id/mobileID/MINEditor.java index 6244ff69..6c865431 100644 --- a/src/main/java/alias/id/mobileID/MINEditor.java +++ b/src/main/java/ua/in/smartjava/alias/id/mobileID/MINEditor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.mobileID; +package ua.in.smartjava.alias.id.mobileID; -import gui.editor.DocumentListenerEditor; +import ua.in.smartjava.gui.editor.DocumentListenerEditor; import java.awt.Color; import java.awt.Cursor; @@ -31,7 +31,7 @@ import javax.swing.JTextField; import javax.swing.text.MaskFormatter; import net.miginfocom.swing.MigLayout; -import alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasID; public class MINEditor extends DocumentListenerEditor { diff --git a/src/main/java/alias/id/mobileID/Min.java b/src/main/java/ua/in/smartjava/alias/id/mobileID/Min.java similarity index 93% rename from src/main/java/alias/id/mobileID/Min.java rename to src/main/java/ua/in/smartjava/alias/id/mobileID/Min.java index bba33fdd..3509b426 100644 --- a/src/main/java/alias/id/mobileID/Min.java +++ b/src/main/java/ua/in/smartjava/alias/id/mobileID/Min.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.mobileID; +package ua.in.smartjava.alias.id.mobileID; import javax.xml.bind.annotation.XmlAttribute; -import alias.id.AliasID; -import alias.id.AliasIDType; +import ua.in.smartjava.alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasIDType; /** * Mobile ID Number diff --git a/src/main/java/alias/id/mpt1327/MPT1327ID.java b/src/main/java/ua/in/smartjava/alias/id/mpt1327/MPT1327ID.java similarity index 93% rename from src/main/java/alias/id/mpt1327/MPT1327ID.java rename to src/main/java/ua/in/smartjava/alias/id/mpt1327/MPT1327ID.java index 12b45d52..9401411c 100644 --- a/src/main/java/alias/id/mpt1327/MPT1327ID.java +++ b/src/main/java/ua/in/smartjava/alias/id/mpt1327/MPT1327ID.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.mpt1327; +package ua.in.smartjava.alias.id.mpt1327; import javax.xml.bind.annotation.XmlAttribute; -import alias.id.AliasID; -import alias.id.AliasIDType; +import ua.in.smartjava.alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasIDType; public class MPT1327ID extends AliasID { diff --git a/src/main/java/alias/id/mpt1327/MPT1327IDEditor.java b/src/main/java/ua/in/smartjava/alias/id/mpt1327/MPT1327IDEditor.java similarity index 95% rename from src/main/java/alias/id/mpt1327/MPT1327IDEditor.java rename to src/main/java/ua/in/smartjava/alias/id/mpt1327/MPT1327IDEditor.java index 4bbfc8fe..796cd9e7 100644 --- a/src/main/java/alias/id/mpt1327/MPT1327IDEditor.java +++ b/src/main/java/ua/in/smartjava/alias/id/mpt1327/MPT1327IDEditor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.mpt1327; +package ua.in.smartjava.alias.id.mpt1327; -import gui.editor.DocumentListenerEditor; +import ua.in.smartjava.gui.editor.DocumentListenerEditor; import java.awt.Color; import java.awt.Cursor; @@ -31,7 +31,7 @@ import javax.swing.JTextField; import javax.swing.text.MaskFormatter; import net.miginfocom.swing.MigLayout; -import alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasID; public class MPT1327IDEditor extends DocumentListenerEditor { diff --git a/src/main/java/alias/id/nonrecordable/NonRecordable.java b/src/main/java/ua/in/smartjava/alias/id/nonrecordable/NonRecordable.java similarity index 71% rename from src/main/java/alias/id/nonrecordable/NonRecordable.java rename to src/main/java/ua/in/smartjava/alias/id/nonrecordable/NonRecordable.java index c881c360..df21c36c 100644 --- a/src/main/java/alias/id/nonrecordable/NonRecordable.java +++ b/src/main/java/ua/in/smartjava/alias/id/nonrecordable/NonRecordable.java @@ -1,7 +1,7 @@ -package alias.id.nonrecordable; +package ua.in.smartjava.alias.id.nonrecordable; -import alias.id.AliasID; -import alias.id.AliasIDType; +import ua.in.smartjava.alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasIDType; public class NonRecordable extends AliasID { diff --git a/src/main/java/alias/id/nonrecordable/NonRecordableEditor.java b/src/main/java/ua/in/smartjava/alias/id/nonrecordable/NonRecordableEditor.java similarity index 79% rename from src/main/java/alias/id/nonrecordable/NonRecordableEditor.java rename to src/main/java/ua/in/smartjava/alias/id/nonrecordable/NonRecordableEditor.java index 6f402371..3c7d8c31 100644 --- a/src/main/java/alias/id/nonrecordable/NonRecordableEditor.java +++ b/src/main/java/ua/in/smartjava/alias/id/nonrecordable/NonRecordableEditor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.nonrecordable; +package ua.in.smartjava.alias.id.nonrecordable; -import gui.editor.DocumentListenerEditor; +import ua.in.smartjava.gui.editor.DocumentListenerEditor; import java.awt.Color; import java.awt.Cursor; @@ -28,7 +28,7 @@ import javax.swing.JLabel; import javax.swing.JOptionPane; import net.miginfocom.swing.MigLayout; -import alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasID; public class NonRecordableEditor extends DocumentListenerEditor { @@ -36,11 +36,11 @@ public class NonRecordableEditor extends DocumentListenerEditor private static final String HELP_TEXT = "" + "

Audio Non-Recordable

" - + "This identifies an alias as non-recordable.

" - + "The alias can still be monitored but associated audio will
" + + "This identifies an ua.in.smartjava.alias as non-recordable.

" + + "The ua.in.smartjava.alias can still be monitored but associated ua.in.smartjava.audio will
" + "not be recorded.

" - + "The default behavior when audio recording is enabled for a
" - + "channel is to record all aliases except any alias with a
" + + "The default behavior when ua.in.smartjava.audio recording is enabled for a
" + + "ua.in.smartjava.channel is to ua.in.smartjava.record all aliases except any ua.in.smartjava.alias with a
" + "non-recordable identifier"; public NonRecordableEditor( AliasID aliasID ) diff --git a/src/main/java/alias/id/priority/Priority.java b/src/main/java/ua/in/smartjava/alias/id/priority/Priority.java similarity index 86% rename from src/main/java/alias/id/priority/Priority.java rename to src/main/java/ua/in/smartjava/alias/id/priority/Priority.java index 9243db45..fc37da40 100644 --- a/src/main/java/alias/id/priority/Priority.java +++ b/src/main/java/ua/in/smartjava/alias/id/priority/Priority.java @@ -15,15 +15,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.priority; +package ua.in.smartjava.alias.id.priority; import javax.xml.bind.annotation.XmlAttribute; -import alias.id.AliasID; -import alias.id.AliasIDType; +import ua.in.smartjava.alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasIDType; /** - * Specifies an (audio) priority level for this alias. + * Specifies an (ua.in.smartjava.audio) priority level for this ua.in.smartjava.alias. */ public class Priority extends AliasID { @@ -46,7 +46,7 @@ public class Priority extends AliasID } /** - * Indicates the associated alias should not be monitored or tracked. + * Indicates the associated ua.in.smartjava.alias should not be monitored or tracked. */ public boolean isDoNotMonitor() { diff --git a/src/main/java/alias/id/priority/PriorityEditor.java b/src/main/java/ua/in/smartjava/alias/id/priority/PriorityEditor.java similarity index 93% rename from src/main/java/alias/id/priority/PriorityEditor.java rename to src/main/java/ua/in/smartjava/alias/id/priority/PriorityEditor.java index 5b797991..7e7f3663 100644 --- a/src/main/java/alias/id/priority/PriorityEditor.java +++ b/src/main/java/ua/in/smartjava/alias/id/priority/PriorityEditor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.priority; +package ua.in.smartjava.alias.id.priority; -import gui.editor.DocumentListenerEditor; +import ua.in.smartjava.gui.editor.DocumentListenerEditor; import java.awt.Color; import java.awt.Cursor; @@ -31,7 +31,7 @@ import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; import net.miginfocom.swing.MigLayout; -import alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasID; public class PriorityEditor extends DocumentListenerEditor { @@ -42,8 +42,8 @@ public class PriorityEditor extends DocumentListenerEditor private static final String HELP_TEXT = "" + "

Call Audio Priority

" + "Priority determines which calls have priority for playback
" - + "over your computer speakers, or designates an alias for
" - + "no-monitoring if you don't want to hear calls from an alias.

" + + "over your computer speakers, or designates an ua.in.smartjava.alias for
" + + "no-monitoring if you don't want to hear calls from an ua.in.smartjava.alias.

" + "Lower values indicate higher priority levels.

" + "Do Not Monitor: slide priority all the way to the right" + ""; diff --git a/src/main/java/alias/id/siteID/SiteID.java b/src/main/java/ua/in/smartjava/alias/id/siteID/SiteID.java similarity index 92% rename from src/main/java/alias/id/siteID/SiteID.java rename to src/main/java/ua/in/smartjava/alias/id/siteID/SiteID.java index a16008e1..1abae20a 100644 --- a/src/main/java/alias/id/siteID/SiteID.java +++ b/src/main/java/ua/in/smartjava/alias/id/siteID/SiteID.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.siteID; +package ua.in.smartjava.alias.id.siteID; import javax.xml.bind.annotation.XmlAttribute; -import alias.id.AliasID; -import alias.id.AliasIDType; +import ua.in.smartjava.alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasIDType; public class SiteID extends AliasID { diff --git a/src/main/java/alias/id/siteID/SiteIDEditor.java b/src/main/java/ua/in/smartjava/alias/id/siteID/SiteIDEditor.java similarity index 95% rename from src/main/java/alias/id/siteID/SiteIDEditor.java rename to src/main/java/ua/in/smartjava/alias/id/siteID/SiteIDEditor.java index 7df5fa7a..e89a5070 100644 --- a/src/main/java/alias/id/siteID/SiteIDEditor.java +++ b/src/main/java/ua/in/smartjava/alias/id/siteID/SiteIDEditor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.siteID; +package ua.in.smartjava.alias.id.siteID; -import gui.editor.DocumentListenerEditor; +import ua.in.smartjava.gui.editor.DocumentListenerEditor; import java.awt.Color; import java.awt.Cursor; @@ -29,7 +29,7 @@ import javax.swing.JOptionPane; import javax.swing.JTextField; import net.miginfocom.swing.MigLayout; -import alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasID; public class SiteIDEditor extends DocumentListenerEditor { diff --git a/src/main/java/alias/id/status/StatusID.java b/src/main/java/ua/in/smartjava/alias/id/status/StatusID.java similarity index 92% rename from src/main/java/alias/id/status/StatusID.java rename to src/main/java/ua/in/smartjava/alias/id/status/StatusID.java index 71ccb5d8..5b995649 100644 --- a/src/main/java/alias/id/status/StatusID.java +++ b/src/main/java/ua/in/smartjava/alias/id/status/StatusID.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.status; +package ua.in.smartjava.alias.id.status; import javax.xml.bind.annotation.XmlAttribute; -import alias.id.AliasID; -import alias.id.AliasIDType; +import ua.in.smartjava.alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasIDType; public class StatusID extends AliasID { diff --git a/src/main/java/alias/id/status/StatusIDEditor.java b/src/main/java/ua/in/smartjava/alias/id/status/StatusIDEditor.java similarity index 93% rename from src/main/java/alias/id/status/StatusIDEditor.java rename to src/main/java/ua/in/smartjava/alias/id/status/StatusIDEditor.java index e4dc8e3d..a81d69ed 100644 --- a/src/main/java/alias/id/status/StatusIDEditor.java +++ b/src/main/java/ua/in/smartjava/alias/id/status/StatusIDEditor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.status; +package ua.in.smartjava.alias.id.status; -import gui.editor.DocumentListenerEditor; +import ua.in.smartjava.gui.editor.DocumentListenerEditor; import java.awt.Color; import java.awt.Cursor; @@ -31,7 +31,7 @@ import javax.swing.JTextField; import javax.swing.text.MaskFormatter; import net.miginfocom.swing.MigLayout; -import alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasID; public class StatusIDEditor extends DocumentListenerEditor { @@ -42,7 +42,7 @@ public class StatusIDEditor extends DocumentListenerEditor + "Status numbers are used in some protocols like Fleetsync.

" + "The status number is assigned a meaning in the radio. You
" + "can assign a 3 digit status code (use leading zeros) to an
" - + "alias where the alias contains the status meaning.

" + + "ua.in.smartjava.alias where the ua.in.smartjava.alias contains the status meaning.

" + "Status: 001 engine start" + ""; diff --git a/src/main/java/alias/id/talkgroup/TalkgroupID.java b/src/main/java/ua/in/smartjava/alias/id/talkgroup/TalkgroupID.java similarity index 94% rename from src/main/java/alias/id/talkgroup/TalkgroupID.java rename to src/main/java/ua/in/smartjava/alias/id/talkgroup/TalkgroupID.java index cb2e8097..1aee13af 100644 --- a/src/main/java/alias/id/talkgroup/TalkgroupID.java +++ b/src/main/java/ua/in/smartjava/alias/id/talkgroup/TalkgroupID.java @@ -15,10 +15,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.talkgroup; +package ua.in.smartjava.alias.id.talkgroup; -import alias.id.AliasID; -import alias.id.AliasIDType; +import ua.in.smartjava.alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasIDType; import javax.xml.bind.annotation.XmlAttribute; diff --git a/src/main/java/alias/id/talkgroup/TalkgroupIDEditor.java b/src/main/java/ua/in/smartjava/alias/id/talkgroup/TalkgroupIDEditor.java similarity index 95% rename from src/main/java/alias/id/talkgroup/TalkgroupIDEditor.java rename to src/main/java/ua/in/smartjava/alias/id/talkgroup/TalkgroupIDEditor.java index 6a63faf6..39b058d5 100644 --- a/src/main/java/alias/id/talkgroup/TalkgroupIDEditor.java +++ b/src/main/java/ua/in/smartjava/alias/id/talkgroup/TalkgroupIDEditor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.talkgroup; +package ua.in.smartjava.alias.id.talkgroup; -import gui.editor.DocumentListenerEditor; +import ua.in.smartjava.gui.editor.DocumentListenerEditor; import java.awt.Color; import java.awt.Cursor; @@ -29,7 +29,7 @@ import javax.swing.JOptionPane; import javax.swing.JTextField; import net.miginfocom.swing.MigLayout; -import alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasID; public class TalkgroupIDEditor extends DocumentListenerEditor { diff --git a/src/main/java/alias/id/uniqueID/UniqueID.java b/src/main/java/ua/in/smartjava/alias/id/uniqueID/UniqueID.java similarity index 92% rename from src/main/java/alias/id/uniqueID/UniqueID.java rename to src/main/java/ua/in/smartjava/alias/id/uniqueID/UniqueID.java index 69302b38..5d6b05bf 100644 --- a/src/main/java/alias/id/uniqueID/UniqueID.java +++ b/src/main/java/ua/in/smartjava/alias/id/uniqueID/UniqueID.java @@ -15,12 +15,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.uniqueID; +package ua.in.smartjava.alias.id.uniqueID; import javax.xml.bind.annotation.XmlAttribute; -import alias.id.AliasID; -import alias.id.AliasIDType; +import ua.in.smartjava.alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasIDType; public class UniqueID extends AliasID { diff --git a/src/main/java/alias/id/uniqueID/UniqueIDEditor.java b/src/main/java/ua/in/smartjava/alias/id/uniqueID/UniqueIDEditor.java similarity index 95% rename from src/main/java/alias/id/uniqueID/UniqueIDEditor.java rename to src/main/java/ua/in/smartjava/alias/id/uniqueID/UniqueIDEditor.java index ea0aa3be..fb402714 100644 --- a/src/main/java/alias/id/uniqueID/UniqueIDEditor.java +++ b/src/main/java/ua/in/smartjava/alias/id/uniqueID/UniqueIDEditor.java @@ -15,9 +15,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package alias.id.uniqueID; +package ua.in.smartjava.alias.id.uniqueID; -import gui.editor.DocumentListenerEditor; +import ua.in.smartjava.gui.editor.DocumentListenerEditor; import java.awt.Color; import java.awt.Cursor; @@ -29,7 +29,7 @@ import javax.swing.JOptionPane; import javax.swing.JTextField; import net.miginfocom.swing.MigLayout; -import alias.id.AliasID; +import ua.in.smartjava.alias.id.AliasID; public class UniqueIDEditor extends DocumentListenerEditor { diff --git a/src/main/java/audio/AudioChannelPanel.java b/src/main/java/ua/in/smartjava/audio/AudioChannelPanel.java similarity index 92% rename from src/main/java/audio/AudioChannelPanel.java rename to src/main/java/ua/in/smartjava/audio/AudioChannelPanel.java index 8d659173..84a6f129 100644 --- a/src/main/java/audio/AudioChannelPanel.java +++ b/src/main/java/ua/in/smartjava/audio/AudioChannelPanel.java @@ -16,19 +16,18 @@ * along with this program. If not, see * ******************************************************************************/ -package audio; +package ua.in.smartjava.audio; -import alias.Alias; -import audio.output.AudioOutput; -import channel.metadata.Metadata; -import icon.IconManager; +import ua.in.smartjava.alias.Alias; +import ua.in.smartjava.audio.output.AudioOutput; +import ua.in.smartjava.channel.metadata.Metadata; +import ua.in.smartjava.icon.IconManager; import net.miginfocom.swing.MigLayout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import properties.SystemProperties; -import sample.Listener; +import ua.in.smartjava.properties.SystemProperties; +import ua.in.smartjava.sample.Listener; import settings.ColorSetting; -import settings.ColorSetting.ColorSettingName; import settings.Setting; import settings.SettingChangeListener; import settings.SettingsManager; @@ -42,7 +41,7 @@ public class AudioChannelPanel extends JPanel private static final long serialVersionUID = 1L; private static final Logger mLog = LoggerFactory.getLogger(AudioChannelPanel.class); - public static final String PROPERTY_PREFIX = "audio.channel.panel.color."; + public static final String PROPERTY_PREFIX = "ua.in.smartjava.audio.ua.in.smartjava.channel.panel.color."; public static final String PROPERTY_COLOR_BACKGROUND = PROPERTY_PREFIX + "background"; public static final String PROPERTY_COLOR_LABEL = PROPERTY_PREFIX + "label"; public static final String PROPERTY_COLOR_MUTED = PROPERTY_PREFIX + "muted"; @@ -156,7 +155,7 @@ public class AudioChannelPanel extends JPanel } /** - * Updates the alias label with text and icon from the alias. Note: this + * Updates the ua.in.smartjava.alias label with text and ua.in.smartjava.icon from the ua.in.smartjava.alias. Note: this * does not occur on the Swing event thread -- wrap any calls to this * method with an event thread call. */ @@ -195,7 +194,7 @@ public class AudioChannelPanel extends JPanel } /** - * Processes audio metadata to update this panel's display values + * Processes ua.in.smartjava.audio metadata to update this panel's display values */ public class AudioMetadataProcessor implements Listener { diff --git a/src/main/java/audio/AudioChannelsPanel.java b/src/main/java/ua/in/smartjava/audio/AudioChannelsPanel.java similarity index 88% rename from src/main/java/audio/AudioChannelsPanel.java rename to src/main/java/ua/in/smartjava/audio/AudioChannelsPanel.java index ebfc1b9b..89e50d9b 100644 --- a/src/main/java/audio/AudioChannelsPanel.java +++ b/src/main/java/ua/in/smartjava/audio/AudioChannelsPanel.java @@ -16,10 +16,10 @@ * along with this program. If not, see * ******************************************************************************/ -package audio; +package ua.in.smartjava.audio; -import audio.output.AudioOutput; -import icon.IconManager; +import ua.in.smartjava.audio.output.AudioOutput; +import ua.in.smartjava.icon.IconManager; import net.miginfocom.swing.MigLayout; import settings.SettingsManager; @@ -51,8 +51,8 @@ public class AudioChannelsPanel extends JPanel } } - /* Add an empty channel panel so that the panel is sized appropriately - * for either a single channel or two channels */ + /* Add an empty ua.in.smartjava.channel panel so that the panel is sized appropriately + * for either a single ua.in.smartjava.channel or two channels */ if(outputs.size() == 1) { addSeparator(); diff --git a/src/main/java/audio/AudioEvent.java b/src/main/java/ua/in/smartjava/audio/AudioEvent.java similarity index 94% rename from src/main/java/audio/AudioEvent.java rename to src/main/java/ua/in/smartjava/audio/AudioEvent.java index ca166059..cb20baba 100644 --- a/src/main/java/audio/AudioEvent.java +++ b/src/main/java/ua/in/smartjava/audio/AudioEvent.java @@ -1,4 +1,4 @@ -package audio; +package ua.in.smartjava.audio; public class AudioEvent { diff --git a/src/main/java/audio/AudioException.java b/src/main/java/ua/in/smartjava/audio/AudioException.java similarity index 90% rename from src/main/java/audio/AudioException.java rename to src/main/java/ua/in/smartjava/audio/AudioException.java index 365b605c..f6ed7a99 100644 --- a/src/main/java/audio/AudioException.java +++ b/src/main/java/ua/in/smartjava/audio/AudioException.java @@ -1,4 +1,4 @@ -package audio; +package ua.in.smartjava.audio; public class AudioException extends Exception { diff --git a/src/main/java/audio/AudioFormats.java b/src/main/java/ua/in/smartjava/audio/AudioFormats.java similarity index 92% rename from src/main/java/audio/AudioFormats.java rename to src/main/java/ua/in/smartjava/audio/AudioFormats.java index ac859f54..4db81790 100644 --- a/src/main/java/audio/AudioFormats.java +++ b/src/main/java/ua/in/smartjava/audio/AudioFormats.java @@ -1,4 +1,4 @@ -package audio; +package ua.in.smartjava.audio; import javax.sound.sampled.AudioFormat; import javax.sound.sampled.DataLine; @@ -72,13 +72,13 @@ public class AudioFormats LITTLE_ENDIAN ); /** - * Source Data Line Info for a 48 kHz, 16-bits signed PCM one channel + * Source Data Line Info for a 48 kHz, 16-ua.in.smartjava.bits signed PCM one ua.in.smartjava.channel */ public static final Line.Info MONO_SOURCE_DATALINE_INFO = new DataLine.Info( SourceDataLine.class, PCM_SIGNED_8KHZ_16BITS_MONO); /** - * Source Data Line Info for a 48 kHz, 16-bits signed PCM two channels + * Source Data Line Info for a 48 kHz, 16-ua.in.smartjava.bits signed PCM two channels */ public static final Line.Info STEREO_SOURCE_DATALINE_INFO = new DataLine.Info( SourceDataLine.class, PCM_SIGNED_8KHZ_16BITS_STEREO); diff --git a/src/main/java/audio/AudioManager.java b/src/main/java/ua/in/smartjava/audio/AudioManager.java similarity index 75% rename from src/main/java/audio/AudioManager.java rename to src/main/java/ua/in/smartjava/audio/AudioManager.java index 4d6c57ac..3e0b80fa 100644 --- a/src/main/java/audio/AudioManager.java +++ b/src/main/java/ua/in/smartjava/audio/AudioManager.java @@ -16,21 +16,21 @@ * along with this program. If not, see * ******************************************************************************/ -package audio; +package ua.in.smartjava.audio; -import audio.AudioEvent.Type; -import audio.output.AudioOutput; -import audio.output.MonoAudioOutput; -import audio.output.StereoAudioOutput; +import ua.in.smartjava.audio.AudioEvent.Type; +import ua.in.smartjava.audio.output.AudioOutput; +import ua.in.smartjava.audio.output.MonoAudioOutput; +import ua.in.smartjava.audio.output.StereoAudioOutput; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import properties.SystemProperties; -import sample.Broadcaster; -import sample.Listener; -import source.mixer.MixerChannel; -import source.mixer.MixerChannelConfiguration; -import source.mixer.MixerManager; -import util.ThreadPool; +import ua.in.smartjava.properties.SystemProperties; +import ua.in.smartjava.sample.Broadcaster; +import ua.in.smartjava.sample.Listener; +import ua.in.smartjava.source.mixer.MixerChannel; +import ua.in.smartjava.source.mixer.MixerChannelConfiguration; +import ua.in.smartjava.source.mixer.MixerManager; +import ua.in.smartjava.util.ThreadPool; import javax.sound.sampled.AudioSystem; import javax.sound.sampled.Mixer; @@ -50,8 +50,8 @@ public class AudioManager implements Listener, IAudioController public static final int AUDIO_TIMEOUT = 1000; //1 second - public static final String AUDIO_CHANNELS_PROPERTY = "audio.manager.channels"; - public static final String AUDIO_MIXER_PROPERTY = "audio.manager.mixer"; + public static final String AUDIO_CHANNELS_PROPERTY = "ua.in.smartjava.audio.manager.channels"; + public static final String AUDIO_MIXER_PROPERTY = "ua.in.smartjava.audio.manager.mixer"; public static final AudioEvent CONFIGURATION_CHANGE_STARTED = new AudioEvent(Type.AUDIO_CONFIGURATION_CHANGE_STARTED, null); @@ -75,8 +75,8 @@ public class AudioManager implements Listener, IAudioController /** - * Processes all audio produced by the decoding channels and routes audio - * packets to any combination of outputs based on any alias audio routing + * Processes all ua.in.smartjava.audio produced by the decoding channels and routes ua.in.smartjava.audio + * packets to any combination of outputs based on any ua.in.smartjava.alias ua.in.smartjava.audio routing * options specified by the user. */ public AudioManager(MixerManager mixerManager) @@ -87,7 +87,7 @@ public class AudioManager implements Listener, IAudioController } /** - * Loads the saved mixer configuration or a default configuration for audio playback. + * Loads the saved mixer configuration or a default configuration for ua.in.smartjava.audio playback. */ private void loadSettings() { @@ -122,7 +122,7 @@ public class AudioManager implements Listener, IAudioController } catch(Exception e) { - mLog.error("Couldn't set stored audio mixer/channel configuration - using default", e); + mLog.error("Couldn't set stored ua.in.smartjava.audio mixer/ua.in.smartjava.channel configuration - using default", e); try { @@ -130,17 +130,17 @@ public class AudioManager implements Listener, IAudioController } catch(Exception e2) { - mLog.error("Couldn't set default audio mixer/channel configuration - no audio will be available", e2); + mLog.error("Couldn't set default ua.in.smartjava.audio mixer/ua.in.smartjava.channel configuration - no ua.in.smartjava.audio will be available", e2); } } } /** - * Creates a default audio playback configuration with a mono audio playback channel. + * Creates a default ua.in.smartjava.audio playback configuration with a mono ua.in.smartjava.audio playback ua.in.smartjava.channel. */ private MixerChannelConfiguration getDefaultConfiguration() { - /* Use the system default mixer and mono channel as default startup */ + /* Use the system default mixer and mono ua.in.smartjava.channel as default startup */ Mixer defaultMixer = AudioSystem.getMixer(null); return new MixerChannelConfiguration(defaultMixer, MixerChannel.MONO); @@ -168,7 +168,7 @@ public class AudioManager implements Listener, IAudioController } /** - * Primary ingest point for audio produced by all decoding channels, for distribution to audio playback devices. + * Primary ingest point for ua.in.smartjava.audio produced by all decoding channels, for distribution to ua.in.smartjava.audio playback devices. */ @Override public synchronized void receive(AudioPacket packet) @@ -177,7 +177,7 @@ public class AudioManager implements Listener, IAudioController } /** - * Checks each audio channel assignment and disconnects any inactive connections + * Checks each ua.in.smartjava.audio ua.in.smartjava.channel assignment and disconnects any inactive connections */ private void disconnectInactiveChannelAssignments() { @@ -201,7 +201,7 @@ public class AudioManager implements Listener, IAudioController } /** - * Identifies the lowest priority channel connection where the a higher value indicates a lower priority. + * Identifies the lowest priority ua.in.smartjava.channel connection where the a higher value indicates a lower priority. */ private void updateLowestPriorityAssignment() { @@ -218,9 +218,9 @@ public class AudioManager implements Listener, IAudioController } /** - * Configures audio playback to use the configuration specified in the entry argument. + * Configures ua.in.smartjava.audio playback to use the configuration specified in the entry argument. * - * @param entry to use in configuring the audio playback setup. + * @param entry to use in configuring the ua.in.smartjava.audio playback setup. * @throws AudioException if there is an error */ @Override @@ -230,10 +230,10 @@ public class AudioManager implements Listener, IAudioController } /** - * Configures audio playback to use the configuration specified in the entry argument. + * Configures ua.in.smartjava.audio playback to use the configuration specified in the entry argument. * - * @param entry to use in configuring the audio playback setup. - * @param saveSettings to save the audio playback configuration settings in the properties file. + * @param entry to use in configuring the ua.in.smartjava.audio playback setup. + * @param saveSettings to save the ua.in.smartjava.audio playback configuration settings in the ua.in.smartjava.properties file. * @throws AudioException if there is an error */ public void setMixerChannelConfiguration(MixerChannelConfiguration entry, boolean saveSettings) throws AudioException @@ -269,7 +269,7 @@ public class AudioManager implements Listener, IAudioController mAudioOutputMap.put(right.getChannelName(), right); break; default: - throw new AudioException("Unsupported mixer channel " + throw new AudioException("Unsupported mixer ua.in.smartjava.channel " + "configuration: " + entry.getMixerChannel()); } @@ -288,8 +288,8 @@ public class AudioManager implements Listener, IAudioController } /** - * Clears all channel assignments and terminates all audio outputs in preparation for complete shutdown or change - * to another mixer/channel configuration + * Clears all ua.in.smartjava.channel assignments and terminates all ua.in.smartjava.audio outputs in preparation for complete shutdown or change + * to another mixer/ua.in.smartjava.channel configuration */ private void disposeCurrentConfiguration() { @@ -310,7 +310,7 @@ public class AudioManager implements Listener, IAudioController } /** - * Current audio playback mixer channel configuration setting. + * Current ua.in.smartjava.audio playback mixer ua.in.smartjava.channel configuration setting. */ @Override public MixerChannelConfiguration getMixerChannelConfiguration() throws AudioException @@ -319,7 +319,7 @@ public class AudioManager implements Listener, IAudioController } /** - * List of audio outputs available for the current mixer channel configuration + * List of ua.in.smartjava.audio outputs available for the current mixer ua.in.smartjava.channel configuration */ @Override public List getAudioOutputs() @@ -339,7 +339,7 @@ public class AudioManager implements Listener, IAudioController } /** - * Adds an audio event listener to receive audio event notifications. + * Adds an ua.in.smartjava.audio event listener to receive ua.in.smartjava.audio event notifications. */ @Override public void addControllerListener(Listener listener) @@ -348,7 +348,7 @@ public class AudioManager implements Listener, IAudioController } /** - * Removes an audio event listener from receiving audio event notifications. + * Removes an ua.in.smartjava.audio event listener from receiving ua.in.smartjava.audio event notifications. */ @Override public void removeControllerListener(Listener listener) @@ -357,11 +357,11 @@ public class AudioManager implements Listener, IAudioController } /** - * Returns an audio output connection for the packet if one is available, or overrides an existing lower priority - * connection. Returns null if no connection is available for the audio packet. + * Returns an ua.in.smartjava.audio output connection for the packet if one is available, or overrides an existing lower priority + * connection. Returns null if no connection is available for the ua.in.smartjava.audio packet. * - * @param audioPacket from a decoding channel source - * @return an audio output connection or null + * @param audioPacket from a decoding ua.in.smartjava.channel ua.in.smartjava.source + * @return an ua.in.smartjava.audio output connection or null */ private AudioOutputConnection getConnection(AudioPacket audioPacket) { @@ -441,15 +441,15 @@ public class AudioManager implements Listener, IAudioController } catch(Exception e) { - mLog.error("Encountered error while processing audio packets", e); + mLog.error("Encountered error while processing ua.in.smartjava.audio packets", e); } } } /** - * Audio output connection manages a connection between a source and an audio - * output and maintains current state information about the audio activity - * received form the source. + * Audio output connection manages a connection between a ua.in.smartjava.source and an ua.in.smartjava.audio + * output and maintains current state information about the ua.in.smartjava.audio activity + * received form the ua.in.smartjava.source. */ public class AudioOutputConnection { @@ -485,18 +485,18 @@ public class AudioManager implements Listener, IAudioController { if(packet.hasMetadata()) { - mLog.error("Received audio packet from channel metadata [" + packet.getMetadata().getMetadataID() + + mLog.error("Received ua.in.smartjava.audio packet from ua.in.smartjava.channel metadata [" + packet.getMetadata().getMetadataID() + "] however this assignment is currently connected to metadata [" + mChannelMetadataID + "]"); } else { - mLog.error("Received audio packet with no metadata - cannot route audio packet"); + mLog.error("Received ua.in.smartjava.audio packet with no metadata - cannot route ua.in.smartjava.audio packet"); } } } /** - * Terminates the audio output and prepares this connection for disposal + * Terminates the ua.in.smartjava.audio output and prepares this connection for disposal */ public void dispose() { @@ -505,7 +505,7 @@ public class AudioManager implements Listener, IAudioController } /** - * Indicates if this assignment is currently disconnected from a channel source + * Indicates if this assignment is currently disconnected from a ua.in.smartjava.channel ua.in.smartjava.source */ public boolean isDisconnected() { @@ -513,7 +513,7 @@ public class AudioManager implements Listener, IAudioController } /** - * Indicates if this assignment is currently connected to a channel source + * Indicates if this assignment is currently connected to a ua.in.smartjava.channel ua.in.smartjava.source */ public boolean isConnected() { @@ -521,8 +521,8 @@ public class AudioManager implements Listener, IAudioController } /** - * Connects this assignment to the indicated source so that audio - * packets from this source can be sent to the audio output + * Connects this assignment to the indicated ua.in.smartjava.source so that ua.in.smartjava.audio + * packets from this ua.in.smartjava.source can be sent to the ua.in.smartjava.audio output */ public void connect(int source, int priority) { @@ -534,7 +534,7 @@ public class AudioManager implements Listener, IAudioController } /** - * Currently connected source or -1 if disconnected + * Currently connected ua.in.smartjava.source or -1 if disconnected */ public int getChannelMetadataID() { @@ -542,8 +542,8 @@ public class AudioManager implements Listener, IAudioController } /** - * Disconnects this assignment from the source and prevents any audio - * from being routed to the audio output until another source is assigned + * Disconnects this assignment from the ua.in.smartjava.source and prevents any ua.in.smartjava.audio + * from being routed to the ua.in.smartjava.audio output until another ua.in.smartjava.source is assigned */ public void disconnect() { @@ -552,8 +552,8 @@ public class AudioManager implements Listener, IAudioController } /** - * Indicates if audio output is current inactive, meaning that the - * audio output hasn't recently processed any audio packets. + * Indicates if ua.in.smartjava.audio output is current inactive, meaning that the + * ua.in.smartjava.audio output hasn't recently processed any ua.in.smartjava.audio packets. */ public boolean isInactive() { diff --git a/src/main/java/audio/AudioModule.java b/src/main/java/ua/in/smartjava/audio/AudioModule.java similarity index 76% rename from src/main/java/audio/AudioModule.java rename to src/main/java/ua/in/smartjava/audio/AudioModule.java index 58b0be0f..3b74f428 100644 --- a/src/main/java/audio/AudioModule.java +++ b/src/main/java/ua/in/smartjava/audio/AudioModule.java @@ -16,30 +16,30 @@ * along with this program. If not, see * ******************************************************************************/ -package audio; +package ua.in.smartjava.audio; -import audio.squelch.ISquelchStateListener; -import audio.squelch.SquelchState; -import channel.metadata.Metadata; -import dsp.filter.design.FilterDesignException; -import dsp.filter.fir.FIRFilterSpecification; -import dsp.filter.fir.remez.RemezFIRFilterDesigner; -import dsp.filter.polyphase.PolyphaseFIRDecimatingFilter_RB; -import module.Module; +import ua.in.smartjava.audio.squelch.ISquelchStateListener; +import ua.in.smartjava.audio.squelch.SquelchState; +import ua.in.smartjava.channel.metadata.Metadata; +import ua.in.smartjava.dsp.filter.design.FilterDesignException; +import ua.in.smartjava.dsp.filter.fir.FIRFilterSpecification; +import ua.in.smartjava.dsp.filter.fir.remez.RemezFIRFilterDesigner; +import ua.in.smartjava.dsp.filter.polyphase.PolyphaseFIRDecimatingFilter_RB; +import ua.in.smartjava.module.Module; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import sample.Listener; -import sample.real.IFilteredRealBufferListener; -import sample.real.RealBuffer; +import ua.in.smartjava.sample.Listener; +import ua.in.smartjava.sample.real.IFilteredRealBufferListener; +import ua.in.smartjava.sample.real.RealBuffer; import java.util.concurrent.ScheduledExecutorService; /** - * Provides packaging of demodulated audio sample buffers into audio packets for - * broadcast to registered audio packet listeners. Includes audio packet - * metadata in constructed audio packets. + * Provides packaging of demodulated ua.in.smartjava.audio ua.in.smartjava.sample buffers into ua.in.smartjava.audio packets for + * broadcast to registered ua.in.smartjava.audio packet listeners. Includes ua.in.smartjava.audio packet + * metadata in constructed ua.in.smartjava.audio packets. * - * Incorporates audio squelch state listener to control if audio packets are + * Incorporates ua.in.smartjava.audio squelch state listener to control if ua.in.smartjava.audio packets are * broadcast or ignored. */ public class AudioModule extends Module implements IAudioPacketProvider, IFilteredRealBufferListener, @@ -51,7 +51,7 @@ public class AudioModule extends Module implements IAudioPacketProvider, IFilter static { - //Band-pass filter to both decimate (48kHz to 8kHz) and block 0 - 300 Hz (LTR signalling). + //Band-pass ua.in.smartjava.filter to both decimate (48kHz to 8kHz) and block 0 - 300 Hz (LTR signalling). FIRFilterSpecification specification = FIRFilterSpecification.bandPassBuilder() .sampleRate(48000) .stopFrequency1(150) @@ -68,14 +68,14 @@ public class AudioModule extends Module implements IAudioPacketProvider, IFilter { if(!designer.isValid()) { - throw new FilterDesignException("Couldn't design the audio decimation filter"); + throw new FilterDesignException("Couldn't design the ua.in.smartjava.audio decimation ua.in.smartjava.filter"); } mDecimationCoefficients = designer.getImpulseResponse(); } catch(FilterDesignException e) { - mLog.debug("Error designing filter", e); + mLog.debug("Error designing ua.in.smartjava.filter", e); } } @@ -125,7 +125,7 @@ public class AudioModule extends Module implements IAudioPacketProvider, IFilter @Override public void stop() { - /* Issue an end audio packet in case a recorder is still rolling */ + /* Issue an end ua.in.smartjava.audio packet in case a recorder is still rolling */ if(mAudioPacketListener != null) { mAudioPacketListener.receive(new AudioPacket(AudioPacket.Type.END, mMetadata.copyOf())); @@ -133,7 +133,7 @@ public class AudioModule extends Module implements IAudioPacketProvider, IFilter } /** - * Processes demodulated audio samples into audio packets with current audio + * Processes demodulated ua.in.smartjava.audio samples into ua.in.smartjava.audio packets with current ua.in.smartjava.audio * metadata and sends to the registered listener */ @Override diff --git a/src/main/java/audio/AudioPacket.java b/src/main/java/ua/in/smartjava/audio/AudioPacket.java similarity index 93% rename from src/main/java/audio/AudioPacket.java rename to src/main/java/ua/in/smartjava/audio/AudioPacket.java index aa655975..420183c3 100644 --- a/src/main/java/audio/AudioPacket.java +++ b/src/main/java/ua/in/smartjava/audio/AudioPacket.java @@ -16,10 +16,10 @@ * along with this program. If not, see * ******************************************************************************/ -package audio; +package ua.in.smartjava.audio; -import channel.metadata.Metadata; -import sample.real.RealBuffer; +import ua.in.smartjava.channel.metadata.Metadata; +import ua.in.smartjava.sample.real.RealBuffer; public class AudioPacket { diff --git a/src/main/java/audio/AudioPacketRateCounter.java b/src/main/java/ua/in/smartjava/audio/AudioPacketRateCounter.java similarity index 93% rename from src/main/java/audio/AudioPacketRateCounter.java rename to src/main/java/ua/in/smartjava/audio/AudioPacketRateCounter.java index 99835a90..99cb6f89 100644 --- a/src/main/java/audio/AudioPacketRateCounter.java +++ b/src/main/java/ua/in/smartjava/audio/AudioPacketRateCounter.java @@ -1,9 +1,9 @@ -package audio; +package ua.in.smartjava.audio; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import sample.Listener; +import ua.in.smartjava.sample.Listener; public class AudioPacketRateCounter implements Listener { diff --git a/src/main/java/audio/AudioPanel.java b/src/main/java/ua/in/smartjava/audio/AudioPanel.java similarity index 94% rename from src/main/java/audio/AudioPanel.java rename to src/main/java/ua/in/smartjava/audio/AudioPanel.java index e91ecacf..4c6a734d 100644 --- a/src/main/java/audio/AudioPanel.java +++ b/src/main/java/ua/in/smartjava/audio/AudioPanel.java @@ -16,17 +16,17 @@ * along with this program. If not, see * ******************************************************************************/ -package audio; +package ua.in.smartjava.audio; -import audio.output.AudioOutput; -import icon.IconManager; +import ua.in.smartjava.audio.output.AudioOutput; +import ua.in.smartjava.icon.IconManager; import net.miginfocom.swing.MigLayout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import sample.Listener; +import ua.in.smartjava.sample.Listener; import settings.SettingsManager; -import source.SourceManager; -import source.mixer.MixerChannelConfiguration; +import ua.in.smartjava.source.SourceManager; +import ua.in.smartjava.source.mixer.MixerChannelConfiguration; import javax.sound.sampled.FloatControl; import javax.swing.*; @@ -177,7 +177,7 @@ public class AudioPanel extends JPanel implements Listener catch(AudioException e) { mLog.error("Error while detecting current mixer " - + "channel configuration", e); + + "ua.in.smartjava.channel configuration", e); } outputMenu.add(mixerItem); @@ -357,12 +357,12 @@ public class AudioPanel extends JPanel implements Listener } catch(AudioException e1) { - mLog.error("Couldn't set mixer channel configuration " + mLog.error("Couldn't set mixer ua.in.smartjava.channel configuration " + "to: " + mConfiguration.toString()); JOptionPane.showMessageDialog(MixerSelectionItem.this, "Couldn't set [" + mConfiguration.toString() + - "] as the audio output device"); + "] as the ua.in.smartjava.audio output device"); } } }); @@ -370,8 +370,8 @@ public class AudioPanel extends JPanel implements Listener } /** - * Mute button to mute all audio output channels exposed by the audio - * controller + * Mute button to mute all ua.in.smartjava.audio output channels exposed by the ua.in.smartjava.audio + * ua.in.smartjava.controller */ public class MuteButton extends JButton { diff --git a/src/main/java/audio/AudioUtils.java b/src/main/java/ua/in/smartjava/audio/AudioUtils.java similarity index 90% rename from src/main/java/audio/AudioUtils.java rename to src/main/java/ua/in/smartjava/audio/AudioUtils.java index fac396f9..34f5c8f9 100644 --- a/src/main/java/audio/AudioUtils.java +++ b/src/main/java/ua/in/smartjava/audio/AudioUtils.java @@ -16,12 +16,12 @@ * along with this program. If not, see * ******************************************************************************/ -package audio; +package ua.in.smartjava.audio; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import record.wave.RealBufferWaveRecorder; -import sample.ConversionUtils; + +import ua.in.smartjava.sample.ConversionUtils; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -33,7 +33,7 @@ public class AudioUtils private final static Logger mLog = LoggerFactory.getLogger(AudioUtils.class); /** - * Converts the audio packets into a byte array of 16-bit, little-endian audio samples + * Converts the ua.in.smartjava.audio packets into a byte array of 16-bit, little-endian ua.in.smartjava.audio samples */ public static byte[] convertTo16BitSamples(List audioPackets) { diff --git a/src/main/java/audio/IAudioController.java b/src/main/java/ua/in/smartjava/audio/IAudioController.java similarity index 68% rename from src/main/java/audio/IAudioController.java rename to src/main/java/ua/in/smartjava/audio/IAudioController.java index 4b12b6d0..d71284f9 100644 --- a/src/main/java/audio/IAudioController.java +++ b/src/main/java/ua/in/smartjava/audio/IAudioController.java @@ -1,13 +1,13 @@ -package audio; +package ua.in.smartjava.audio; import java.util.List; -import sample.Listener; -import source.mixer.MixerChannelConfiguration; -import audio.output.AudioOutput; +import ua.in.smartjava.sample.Listener; +import ua.in.smartjava.source.mixer.MixerChannelConfiguration; +import ua.in.smartjava.audio.output.AudioOutput; /** - * Interface for controlling one or more audio channels + * Interface for controlling one or more ua.in.smartjava.audio channels */ public interface IAudioController { diff --git a/src/main/java/audio/IAudioPacketListener.java b/src/main/java/ua/in/smartjava/audio/IAudioPacketListener.java similarity index 58% rename from src/main/java/audio/IAudioPacketListener.java rename to src/main/java/ua/in/smartjava/audio/IAudioPacketListener.java index 298f5e1c..42ae2e2f 100644 --- a/src/main/java/audio/IAudioPacketListener.java +++ b/src/main/java/ua/in/smartjava/audio/IAudioPacketListener.java @@ -1,6 +1,6 @@ -package audio; +package ua.in.smartjava.audio; -import sample.Listener; +import ua.in.smartjava.sample.Listener; public interface IAudioPacketListener { diff --git a/src/main/java/audio/IAudioPacketProvider.java b/src/main/java/ua/in/smartjava/audio/IAudioPacketProvider.java similarity index 68% rename from src/main/java/audio/IAudioPacketProvider.java rename to src/main/java/ua/in/smartjava/audio/IAudioPacketProvider.java index 47f4b0be..dafafa4e 100644 --- a/src/main/java/audio/IAudioPacketProvider.java +++ b/src/main/java/ua/in/smartjava/audio/IAudioPacketProvider.java @@ -1,6 +1,6 @@ -package audio; +package ua.in.smartjava.audio; -import sample.Listener; +import ua.in.smartjava.sample.Listener; public interface IAudioPacketProvider { diff --git a/src/main/java/audio/InversionFrequency.java b/src/main/java/ua/in/smartjava/audio/InversionFrequency.java similarity index 98% rename from src/main/java/audio/InversionFrequency.java rename to src/main/java/ua/in/smartjava/audio/InversionFrequency.java index da493f19..93eea7b9 100644 --- a/src/main/java/audio/InversionFrequency.java +++ b/src/main/java/ua/in/smartjava/audio/InversionFrequency.java @@ -15,7 +15,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see ******************************************************************************/ -package audio; +package ua.in.smartjava.audio; /** * Standard voice inversion foldover frequencies diff --git a/src/main/java/audio/broadcast/AudioBroadcaster.java b/src/main/java/ua/in/smartjava/audio/broadcast/AudioBroadcaster.java similarity index 86% rename from src/main/java/audio/broadcast/AudioBroadcaster.java rename to src/main/java/ua/in/smartjava/audio/broadcast/AudioBroadcaster.java index 3cb4c309..c50964b9 100644 --- a/src/main/java/audio/broadcast/AudioBroadcaster.java +++ b/src/main/java/ua/in/smartjava/audio/broadcast/AudioBroadcaster.java @@ -16,14 +16,14 @@ * along with this program. If not, see * ******************************************************************************/ -package audio.broadcast; +package ua.in.smartjava.audio.broadcast; -import audio.convert.ISilenceGenerator; -import channel.metadata.Metadata; +import ua.in.smartjava.audio.convert.ISilenceGenerator; +import ua.in.smartjava.channel.metadata.Metadata; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import sample.Listener; -import util.ThreadPool; +import ua.in.smartjava.sample.Listener; +import ua.in.smartjava.util.ThreadPool; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -58,25 +58,25 @@ public abstract class AudioBroadcaster implements Listener private AtomicBoolean mStreaming = new AtomicBoolean(); /** - * AudioBroadcaster for streaming audio recordings to a remote streaming audio server. Audio recordings are + * AudioBroadcaster for streaming ua.in.smartjava.audio recordings to a remote streaming ua.in.smartjava.audio server. Audio recordings are * generated by an internal StreamManager that converts an inbound stream of AudioPackets into a recording of the - * desired audio format (e.g. MP3) and nominates the recording to an internal recording queue for streaming. The - * broadcaster supports receiving audio packets from multiple audio sources. Each audio packet's internal audio - * metadata source string is used to reassemble each packet stream. Recordings are capped at 30 seconds length. - * If a source audio packet stream exceeds 30 seconds in length, it will be chunked into 30 second recordings. + * desired ua.in.smartjava.audio format (e.g. MP3) and nominates the recording to an internal recording queue for streaming. The + * broadcaster supports receiving ua.in.smartjava.audio packets from multiple ua.in.smartjava.audio sources. Each ua.in.smartjava.audio packet's internal ua.in.smartjava.audio + * metadata ua.in.smartjava.source string is used to reassemble each packet stream. Recordings are capped at 30 seconds length. + * If a ua.in.smartjava.source ua.in.smartjava.audio packet stream exceeds 30 seconds in length, it will be chunked into 30 second recordings. * - * This broadcaster supports a time delay setting for delaying broadcast of audio recordings. The delay setting is + * This broadcaster supports a time delay setting for delaying broadcast of ua.in.smartjava.audio recordings. The delay setting is * defined in the broadcast configuration. When this delay is greater than zero, the recording will remain in the - * audio broadcaster queue until the recording start time + delay elapses. Audio recordings are processed in a FIFO + * ua.in.smartjava.audio broadcaster queue until the recording start time + delay elapses. Audio recordings are processed in a FIFO * manner. * * Use the start() and stop() methods to connect to/disconnect from the remote server. Audio recordings will be * streamed to the remote server when available. One second silence frames will be broadcast to the server when - * there are no recordings available, in order to maintain a connection with the remote server. Any audio packet + * there are no recordings available, in order to maintain a connection with the remote server. Any ua.in.smartjava.audio packet * streams received while the broadcaster is stopped will be ignored. * - * The last audio packet's metadata is automatically attached to the closed audio recording when it is enqueued for - * broadcast. That metadata will be updated on the remote server once the audio recording is opened for streaming. + * The last ua.in.smartjava.audio packet's metadata is automatically attached to the closed ua.in.smartjava.audio recording when it is enqueued for + * broadcast. That metadata will be updated on the remote server once the ua.in.smartjava.audio recording is opened for streaming. */ public AudioBroadcaster(BroadcastConfiguration broadcastConfiguration) { @@ -87,7 +87,7 @@ public abstract class AudioBroadcaster implements Listener } /** - * Broadcast binary audio data frames or sequences. + * Broadcast binary ua.in.smartjava.audio data frames or sequences. */ protected abstract void broadcastAudio(byte[] audio); @@ -97,7 +97,7 @@ public abstract class AudioBroadcaster implements Listener protected abstract IBroadcastMetadataUpdater getMetadataUpdater(); /** - * Broadcasts the next song's audio metadata prior to streaming the next song. + * Broadcasts the next song's ua.in.smartjava.audio metadata prior to streaming the next song. * * @param metadata for the next recording that will be streamed */ @@ -117,7 +117,7 @@ public abstract class AudioBroadcaster implements Listener protected abstract void disconnect(); /** - * Connects to the remote server specified by the broadcast configuration and starts audio streaming. + * Connects to the remote server specified by the broadcast configuration and starts ua.in.smartjava.audio streaming. */ public void start() { @@ -174,7 +174,7 @@ public abstract class AudioBroadcaster implements Listener } /** - * Number of audio recordings streamed to remote server + * Number of ua.in.smartjava.audio recordings streamed to remote server */ public int getStreamedAudioCount() { @@ -182,7 +182,7 @@ public abstract class AudioBroadcaster implements Listener } /** - * Number of audio recordings that were removed for exceeding age limit + * Number of ua.in.smartjava.audio recordings that were removed for exceeding age limit */ public int getAgedOffAudioCount() { @@ -190,7 +190,7 @@ public abstract class AudioBroadcaster implements Listener } /** - * Primary insert method for the stream manager to nominate completed audio recordings for broadcast. + * Primary insert method for the stream manager to nominate completed ua.in.smartjava.audio recordings for broadcast. * * @param recording to queue for broadcasting */ @@ -257,7 +257,7 @@ public abstract class AudioBroadcaster implements Listener if(!connected()) { - //Remove all pending audio recordings + //Remove all pending ua.in.smartjava.audio recordings while(!mAudioRecordingQueue.isEmpty()) { try @@ -361,7 +361,7 @@ public abstract class AudioBroadcaster implements Listener } catch(IOException ioe) { - mLog.error("Error reading from in-memory audio recording input stream", ioe); + mLog.error("Error reading from in-memory ua.in.smartjava.audio recording input stream", ioe); } } else @@ -371,7 +371,7 @@ public abstract class AudioBroadcaster implements Listener } catch(Exception e) { - mLog.error("Error while processing audio streaming queue", e); + mLog.error("Error while processing ua.in.smartjava.audio streaming queue", e); } mProcessing.set(false); @@ -447,7 +447,7 @@ public abstract class AudioBroadcaster implements Listener } catch(IOException ioe) { - mLog.error("Stream [" + getBroadcastConfiguration().getName() + "] error reading temporary audio " + + mLog.error("Stream [" + getBroadcastConfiguration().getName() + "] error reading temporary ua.in.smartjava.audio " + "stream recording [" + nextRecording.getPath().toString() + "] - skipping recording - ", ioe); mInputStream = null; diff --git a/src/main/java/audio/broadcast/AudioRecording.java b/src/main/java/ua/in/smartjava/audio/broadcast/AudioRecording.java similarity index 91% rename from src/main/java/audio/broadcast/AudioRecording.java rename to src/main/java/ua/in/smartjava/audio/broadcast/AudioRecording.java index f80a0c66..8b0382ea 100644 --- a/src/main/java/audio/broadcast/AudioRecording.java +++ b/src/main/java/ua/in/smartjava/audio/broadcast/AudioRecording.java @@ -16,9 +16,9 @@ * along with this program. If not, see * ******************************************************************************/ -package audio.broadcast; +package ua.in.smartjava.audio.broadcast; -import channel.metadata.Metadata; +import ua.in.smartjava.channel.metadata.Metadata; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +38,7 @@ public class AudioRecording implements Comparable /** * Audio recording that is ready to be streamed * - * @param path to the audio recording file + * @param path to the ua.in.smartjava.audio recording file * @param metadata associated with the recording * @param start time of recording in milliseconds since epoch * @param recordingLength in milliseconds @@ -52,7 +52,7 @@ public class AudioRecording implements Comparable } /** - * Path to the completed audio recording + * Path to the completed ua.in.smartjava.audio recording */ public Path getPath() { @@ -60,7 +60,7 @@ public class AudioRecording implements Comparable } /** - * Optional audio metadata for the recording. + * Optional ua.in.smartjava.audio metadata for the recording. */ public Metadata getMetadata() { diff --git a/src/main/java/audio/broadcast/BroadcastConfiguration.java b/src/main/java/ua/in/smartjava/audio/broadcast/BroadcastConfiguration.java similarity index 90% rename from src/main/java/audio/broadcast/BroadcastConfiguration.java rename to src/main/java/ua/in/smartjava/audio/broadcast/BroadcastConfiguration.java index 2a2ee63b..c386d26b 100644 --- a/src/main/java/audio/broadcast/BroadcastConfiguration.java +++ b/src/main/java/ua/in/smartjava/audio/broadcast/BroadcastConfiguration.java @@ -16,13 +16,13 @@ * along with this program. If not, see * ******************************************************************************/ -package audio.broadcast; +package ua.in.smartjava.audio.broadcast; -import audio.broadcast.broadcastify.BroadcastifyConfiguration; -import audio.broadcast.icecast.IcecastHTTPConfiguration; -import audio.broadcast.icecast.IcecastTCPConfiguration; -import audio.broadcast.shoutcast.v1.ShoutcastV1Configuration; -import audio.broadcast.shoutcast.v2.ShoutcastV2Configuration; +import ua.in.smartjava.audio.broadcast.broadcastify.BroadcastifyConfiguration; +import ua.in.smartjava.audio.broadcast.icecast.IcecastHTTPConfiguration; +import ua.in.smartjava.audio.broadcast.icecast.IcecastTCPConfiguration; +import ua.in.smartjava.audio.broadcast.shoutcast.v1.ShoutcastV1Configuration; +import ua.in.smartjava.audio.broadcast.shoutcast.v2.ShoutcastV2Configuration; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; @@ -59,7 +59,7 @@ public abstract class BroadcastConfiguration public abstract BroadcastConfiguration copyOf(); /** - * Broadcast audio streaming configuration. Describes the streaming server and configuration details. + * Broadcast ua.in.smartjava.audio streaming configuration. Describes the streaming server and configuration details. */ public BroadcastConfiguration(BroadcastFormat format) { @@ -200,7 +200,7 @@ public abstract class BroadcastConfiguration } /** - * Audio broadcastAudio delay from recording start until the audio file is broadcastAudio to the server. + * Audio broadcastAudio delay from recording start until the ua.in.smartjava.audio file is broadcastAudio to the server. */ @XmlAttribute(name = "delay") public long getDelay() @@ -209,7 +209,7 @@ public abstract class BroadcastConfiguration } /** - * User specified delay in milli-seconds from audio call start until when the audio is broadcastAudio to the server. + * User specified delay in milli-seconds from ua.in.smartjava.audio call start until when the ua.in.smartjava.audio is broadcastAudio to the server. * @param delay in milliseconds */ public void setDelay(long delay) diff --git a/src/main/java/audio/broadcast/BroadcastConfigurationEditor.java b/src/main/java/ua/in/smartjava/audio/broadcast/BroadcastConfigurationEditor.java similarity index 91% rename from src/main/java/audio/broadcast/BroadcastConfigurationEditor.java rename to src/main/java/ua/in/smartjava/audio/broadcast/BroadcastConfigurationEditor.java index 4c1b5f71..62104d89 100644 --- a/src/main/java/audio/broadcast/BroadcastConfigurationEditor.java +++ b/src/main/java/ua/in/smartjava/audio/broadcast/BroadcastConfigurationEditor.java @@ -16,11 +16,11 @@ * along with this program. If not, see * ******************************************************************************/ -package audio.broadcast; +package ua.in.smartjava.audio.broadcast; -import alias.AliasModel; -import gui.editor.DocumentListenerEditor; -import icon.IconManager; +import ua.in.smartjava.alias.AliasModel; +import ua.in.smartjava.gui.editor.DocumentListenerEditor; +import ua.in.smartjava.icon.IconManager; import javax.swing.*; @@ -39,9 +39,9 @@ public abstract class BroadcastConfigurationEditor extends DocumentListenerEdito /** * Updates the configuration with the new name and prompts the user to update any aliases that have a broadcast - * channel alias id with the old name to update to the new name. + * ua.in.smartjava.channel ua.in.smartjava.alias id with the old name to update to the new name. * - * @param broadcastConfiguration to assign a new channel name + * @param broadcastConfiguration to assign a new ua.in.smartjava.channel name * @param newName to assign to the broadcast configuration. Note: assumes that validateConfiguration() has been * invoked to verify that newName is non-null and non-empty */ diff --git a/src/main/java/audio/broadcast/BroadcastEvent.java b/src/main/java/ua/in/smartjava/audio/broadcast/BroadcastEvent.java similarity index 90% rename from src/main/java/audio/broadcast/BroadcastEvent.java rename to src/main/java/ua/in/smartjava/audio/broadcast/BroadcastEvent.java index f7fc4cff..54ff0645 100644 --- a/src/main/java/audio/broadcast/BroadcastEvent.java +++ b/src/main/java/ua/in/smartjava/audio/broadcast/BroadcastEvent.java @@ -16,7 +16,7 @@ * along with this program. If not, see * ******************************************************************************/ -package audio.broadcast; +package ua.in.smartjava.audio.broadcast; public class BroadcastEvent { @@ -25,9 +25,9 @@ public class BroadcastEvent private Event mEvent; /** - * AliasEvent - event describing any changes to an alias + * AliasEvent - event describing any changes to an ua.in.smartjava.alias * - * @param configuration - alias that changed + * @param configuration - ua.in.smartjava.alias that changed * @param event - change event */ public BroadcastEvent(BroadcastConfiguration configuration, Event event) @@ -53,7 +53,7 @@ public class BroadcastEvent } /** - * Indicates if this event pertains to an audio broadcaster + * Indicates if this event pertains to an ua.in.smartjava.audio broadcaster */ public boolean isAudioBroadcasterEvent() { diff --git a/src/main/java/audio/broadcast/BroadcastFactory.java b/src/main/java/ua/in/smartjava/audio/broadcast/BroadcastFactory.java similarity index 73% rename from src/main/java/audio/broadcast/BroadcastFactory.java rename to src/main/java/ua/in/smartjava/audio/broadcast/BroadcastFactory.java index 75caef3b..7c32e390 100644 --- a/src/main/java/audio/broadcast/BroadcastFactory.java +++ b/src/main/java/ua/in/smartjava/audio/broadcast/BroadcastFactory.java @@ -16,34 +16,34 @@ * along with this program. If not, see * ******************************************************************************/ -package audio.broadcast; +package ua.in.smartjava.audio.broadcast; -import alias.AliasModel; -import audio.broadcast.broadcastify.BroadcastifyConfiguration; -import audio.broadcast.broadcastify.BroadcastifyConfigurationEditor; -import audio.broadcast.icecast.IcecastHTTPAudioBroadcaster; -import audio.broadcast.icecast.IcecastHTTPConfiguration; -import audio.broadcast.icecast.IcecastHTTPConfigurationEditor; -import audio.broadcast.icecast.IcecastTCPAudioBroadcaster; -import audio.broadcast.icecast.IcecastTCPConfiguration; -import audio.broadcast.icecast.IcecastTCPConfigurationEditor; -import audio.broadcast.shoutcast.v1.ShoutcastV1AudioBroadcaster; -import audio.broadcast.shoutcast.v1.ShoutcastV1Configuration; -import audio.broadcast.shoutcast.v1.ShoutcastV1ConfigurationEditor; -import audio.broadcast.shoutcast.v2.ShoutcastV2AudioBroadcaster; -import audio.broadcast.shoutcast.v2.ShoutcastV2Configuration; -import audio.broadcast.shoutcast.v2.ShoutcastV2ConfigurationEditor; -import audio.convert.IAudioConverter; -import audio.convert.ISilenceGenerator; -import audio.convert.MP3AudioConverter; -import audio.convert.MP3SilenceGenerator; -import gui.editor.Editor; -import gui.editor.EmptyEditor; -import icon.IconManager; +import ua.in.smartjava.alias.AliasModel; +import ua.in.smartjava.audio.broadcast.broadcastify.BroadcastifyConfiguration; +import ua.in.smartjava.audio.broadcast.broadcastify.BroadcastifyConfigurationEditor; +import ua.in.smartjava.audio.broadcast.icecast.IcecastHTTPAudioBroadcaster; +import ua.in.smartjava.audio.broadcast.icecast.IcecastHTTPConfiguration; +import ua.in.smartjava.audio.broadcast.icecast.IcecastHTTPConfigurationEditor; +import ua.in.smartjava.audio.broadcast.icecast.IcecastTCPAudioBroadcaster; +import ua.in.smartjava.audio.broadcast.icecast.IcecastTCPConfiguration; +import ua.in.smartjava.audio.broadcast.icecast.IcecastTCPConfigurationEditor; +import ua.in.smartjava.audio.broadcast.shoutcast.v1.ShoutcastV1AudioBroadcaster; +import ua.in.smartjava.audio.broadcast.shoutcast.v1.ShoutcastV1Configuration; +import ua.in.smartjava.audio.broadcast.shoutcast.v1.ShoutcastV1ConfigurationEditor; +import ua.in.smartjava.audio.broadcast.shoutcast.v2.ShoutcastV2AudioBroadcaster; +import ua.in.smartjava.audio.broadcast.shoutcast.v2.ShoutcastV2Configuration; +import ua.in.smartjava.audio.broadcast.shoutcast.v2.ShoutcastV2ConfigurationEditor; +import ua.in.smartjava.audio.convert.IAudioConverter; +import ua.in.smartjava.audio.convert.ISilenceGenerator; +import ua.in.smartjava.audio.convert.MP3AudioConverter; +import ua.in.smartjava.audio.convert.MP3SilenceGenerator; +import ua.in.smartjava.gui.editor.Editor; +import ua.in.smartjava.gui.editor.EmptyEditor; +import ua.in.smartjava.icon.IconManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import record.AudioRecorder; -import record.mp3.MP3Recorder; +import ua.in.smartjava.record.AudioRecorder; +import ua.in.smartjava.record.mp3.MP3Recorder; import java.nio.file.Path; @@ -55,9 +55,9 @@ public class BroadcastFactory public static final boolean MP3_CONSTANT_BITRATE = false; /** - * Creates an audio streaming broadcaster for the configuration + * Creates an ua.in.smartjava.audio streaming broadcaster for the configuration * - * @param configuration describing the server and audio types + * @param configuration describing the server and ua.in.smartjava.audio types * @return configured broadcaster or null */ public static AudioBroadcaster getBroadcaster(BroadcastConfiguration configuration) @@ -92,10 +92,10 @@ public class BroadcastFactory } /** - * Creates an audio convert to convert from 8 kHz PCM audio to the specified format + * Creates an ua.in.smartjava.audio convert to convert from 8 kHz PCM ua.in.smartjava.audio to the specified format * - * @param configuration containing the requested output audio format - * @return audio convert or null + * @param configuration containing the requested output ua.in.smartjava.audio format + * @return ua.in.smartjava.audio convert or null */ public static IAudioConverter getAudioConverter(BroadcastConfiguration configuration) { @@ -114,7 +114,7 @@ public class BroadcastFactory * Creates a broadcastAudio configuration for the specified server type and format * * @param serverType for the configuration - * @param format for the output audio format + * @param format for the output ua.in.smartjava.audio format * @return constructed (empty) configuration */ public static BroadcastConfiguration getConfiguration(BroadcastServerType serverType, BroadcastFormat format) @@ -182,7 +182,7 @@ public class BroadcastFactory } /** - * Creates an audio recorder for the specified broadcastAudio format using the specified path output file name + * Creates an ua.in.smartjava.audio recorder for the specified broadcastAudio format using the specified path output file name */ public static AudioRecorder getAudioRecorder(Path path, BroadcastFormat broadcastFormat) { @@ -191,7 +191,7 @@ public class BroadcastFactory case MP3: return new MP3Recorder(path); default: - mLog.debug("Unrecognized broadcastAudio format [" + broadcastFormat + "] cannot create audio recorder"); + mLog.debug("Unrecognized broadcastAudio format [" + broadcastFormat + "] cannot create ua.in.smartjava.audio recorder"); return null; } } diff --git a/src/main/java/audio/broadcast/BroadcastFormat.java b/src/main/java/ua/in/smartjava/audio/broadcast/BroadcastFormat.java similarity index 93% rename from src/main/java/audio/broadcast/BroadcastFormat.java rename to src/main/java/ua/in/smartjava/audio/broadcast/BroadcastFormat.java index 134423bd..06996b4e 100644 --- a/src/main/java/audio/broadcast/BroadcastFormat.java +++ b/src/main/java/ua/in/smartjava/audio/broadcast/BroadcastFormat.java @@ -16,11 +16,11 @@ * along with this program. If not, see * ******************************************************************************/ -package audio.broadcast; +package ua.in.smartjava.audio.broadcast; public enum BroadcastFormat { - MP3("audio/mpeg", ".mp3"); + MP3("ua/in/smartjava/audio/mpeg", ".mp3"); private String mValue; private String mFileExtension; diff --git a/src/main/java/audio/broadcast/BroadcastModel.java b/src/main/java/ua/in/smartjava/audio/broadcast/BroadcastModel.java similarity index 95% rename from src/main/java/audio/broadcast/BroadcastModel.java rename to src/main/java/ua/in/smartjava/audio/broadcast/BroadcastModel.java index 04f64f76..e358de41 100644 --- a/src/main/java/audio/broadcast/BroadcastModel.java +++ b/src/main/java/ua/in/smartjava/audio/broadcast/BroadcastModel.java @@ -16,18 +16,18 @@ * along with this program. If not, see * ******************************************************************************/ -package audio.broadcast; +package ua.in.smartjava.audio.broadcast; -import alias.id.broadcast.BroadcastChannel; -import audio.AudioPacket; -import channel.metadata.Metadata; -import icon.IconManager; +import ua.in.smartjava.alias.id.broadcast.BroadcastChannel; +import ua.in.smartjava.audio.AudioPacket; +import ua.in.smartjava.channel.metadata.Metadata; +import ua.in.smartjava.icon.IconManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import properties.SystemProperties; -import sample.Broadcaster; -import sample.Listener; -import util.ThreadPool; +import ua.in.smartjava.properties.SystemProperties; +import ua.in.smartjava.sample.Broadcaster; +import ua.in.smartjava.sample.Listener; +import ua.in.smartjava.util.ThreadPool; import javax.swing.*; import javax.swing.table.AbstractTableModel; @@ -84,7 +84,7 @@ public class BroadcastModel extends AbstractTableModel implements Listener