diff --git a/Kayak-core/pom.xml b/Kayak-core/pom.xml index 062ba3a..0e1a1e0 100644 --- a/Kayak-core/pom.xml +++ b/Kayak-core/pom.xml @@ -39,14 +39,14 @@ com.github.kayak.core.description - 3.13 + 3.13.3 org.apache.maven.plugins maven-compiler-plugin - 3.0 + 3.8.0 1.7 1.7 @@ -56,7 +56,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.3.2 + 2.6 true diff --git a/Kayak-kcd/pom.xml b/Kayak-kcd/pom.xml index 3c72bda..d61d3fa 100644 --- a/Kayak-kcd/pom.xml +++ b/Kayak-kcd/pom.xml @@ -38,19 +38,29 @@ junit junit - 4.8.1 + 4.12 test org.netbeans.api org-openide-util-lookup - RELEASE80 + RELEASE82 jar + + com.sun.xml.bind + jaxb-impl + 2.3.1 + + + com.sun.xml.bind + jaxb-core + 2.3.0.1 + javax.xml.bind jaxb-api - 2.2.2 + 2.3.1 ${project.groupId} @@ -71,11 +81,11 @@ org.codehaus.mojo nbm-maven-plugin - 3.13 + 3.13.3 true - com.github.kayak.canio.kcd + com.github.kayak.canio com.github.kayak.canio.kcd.loader @@ -84,7 +94,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.0 + 3.8.0 1.7 1.7 @@ -94,7 +104,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.3.2 + 2.6 true @@ -105,7 +115,7 @@ org.jvnet.jaxb2.maven2 maven-jaxb2-plugin - 0.8.0 + 0.14.0 src/main/resources/com/github/kayak/canio/kcd/loader diff --git a/Kayak-logging/pom.xml b/Kayak-logging/pom.xml index 46777f5..5cabd7d 100644 --- a/Kayak-logging/pom.xml +++ b/Kayak-logging/pom.xml @@ -33,7 +33,7 @@ org.netbeans.api org-openide-util - RELEASE80 + RELEASE82 ${project.groupId} @@ -45,37 +45,37 @@ org-openide-util-lookup org.netbeans.api jar - RELEASE71 + RELEASE82 org-openide-windows org.netbeans.api jar - RELEASE80 + RELEASE82 org-openide-awt org.netbeans.api jar - RELEASE80 + RELEASE82 org-openide-nodes org.netbeans.api jar - RELEASE80 + RELEASE82 org-openide-explorer org.netbeans.api jar - RELEASE80 + RELEASE82 org-openide-filesystems org.netbeans.api jar - RELEASE80 + RELEASE82 ${project.groupId} @@ -85,34 +85,39 @@ org.netbeans.api org-netbeans-modules-settings - RELEASE80 + RELEASE82 org.netbeans.api org-netbeans-modules-options-api - RELEASE80 + RELEASE82 org.netbeans.api org-openide-loaders - RELEASE80 + RELEASE82 + + + org.netbeans.api + org-openide-util-ui + RELEASE82 + + + org.netbeans.api + org-netbeans-api-progress-nb + RELEASE82 org-netbeans-api-progress org.netbeans.api jar - RELEASE80 + RELEASE82 org-openide-modules org.netbeans.api jar - RELEASE80 - - - org.tango-project - tango-icon-theme - 0.8.0 + RELEASE82 @@ -121,7 +126,7 @@ org.codehaus.mojo nbm-maven-plugin - 3.13 + 3.13.3 true @@ -129,7 +134,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.0 + 3.8.0 1.7 1.7 @@ -139,7 +144,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.3.2 + 2.6 true diff --git a/Kayak-logging/src/main/java/com/github/kayak/logging/BookmarkLogFileAction.java b/Kayak-logging/src/main/java/com/github/kayak/logging/BookmarkLogFileAction.java index b08ec2d..2af32f3 100644 --- a/Kayak-logging/src/main/java/com/github/kayak/logging/BookmarkLogFileAction.java +++ b/Kayak-logging/src/main/java/com/github/kayak/logging/BookmarkLogFileAction.java @@ -29,7 +29,7 @@ * * @author Jan-Niklas Meier */ -@ActionRegistration(displayName="Bookmark Log file...", iconBase="org/tango-project/tango-icon-theme/16x16/actions/bookmark-new.png", iconInMenu=true, surviveFocusChange=true) +@ActionRegistration(displayName="Bookmark Log file...", iconBase="com/github/kayak/logging/icons/bookmark-new.png", iconInMenu=true, surviveFocusChange=true) @ActionID(category="Log files", id="com.github.kayak.logging.BookmarkLogFileAction") @ActionReferences(value = { @ActionReference(path="Menu/Log files", position=30)}) diff --git a/Kayak-logging/src/main/java/com/github/kayak/logging/CompressLogFileAction.java b/Kayak-logging/src/main/java/com/github/kayak/logging/CompressLogFileAction.java index ef1eeda..847e15a 100644 --- a/Kayak-logging/src/main/java/com/github/kayak/logging/CompressLogFileAction.java +++ b/Kayak-logging/src/main/java/com/github/kayak/logging/CompressLogFileAction.java @@ -36,7 +36,7 @@ * * @author Jan-Niklas Meier */ -@ActionRegistration(displayName="Compress Log file...", iconBase="org/tango-project/tango-icon-theme/16x16/mimetypes/package-x-generic.png", iconInMenu=true, surviveFocusChange=true) +@ActionRegistration(displayName="Compress Log file...", iconBase="com/github/kayak/logging/icons/package-x-generic.png", iconInMenu=true, surviveFocusChange=true) @ActionID(category="Log files", id="com.github.kayak.logging.CompressLogFileAction") @ActionReferences(value = { @ActionReference(path="Menu/Log files", position=20)}) diff --git a/Kayak-logging/src/main/java/com/github/kayak/logging/DeleteLogFileAction.java b/Kayak-logging/src/main/java/com/github/kayak/logging/DeleteLogFileAction.java index 117822a..ea43234 100644 --- a/Kayak-logging/src/main/java/com/github/kayak/logging/DeleteLogFileAction.java +++ b/Kayak-logging/src/main/java/com/github/kayak/logging/DeleteLogFileAction.java @@ -18,7 +18,7 @@ * * @author Jan-Niklas Meier */ -@ActionRegistration(displayName="Delete Log file...", iconBase="org/tango-project/tango-icon-theme/16x16/actions/edit-delete.png", iconInMenu=true, surviveFocusChange=true) +@ActionRegistration(displayName="Delete Log file...", iconBase="com/github/kayak/logging/icons/edit-delete.png", iconInMenu=true, surviveFocusChange=true) @ActionID(category="Log files", id="com.github.kayak.logging.DeleteLogFileAction") @ActionReferences(value = { @ActionReference(path="Menu/Log files", position=40)}) diff --git a/Kayak-logging/src/main/java/com/github/kayak/logging/LogDirectoryFactory.java b/Kayak-logging/src/main/java/com/github/kayak/logging/LogDirectoryFactory.java index 1abe31e..a92d5e2 100644 --- a/Kayak-logging/src/main/java/com/github/kayak/logging/LogDirectoryFactory.java +++ b/Kayak-logging/src/main/java/com/github/kayak/logging/LogDirectoryFactory.java @@ -63,7 +63,7 @@ protected boolean createKeys(List toPopulate) { @Override protected Node[] createNodesForKey(String key) { AbstractNode node = new AbstractNode(Children.create(new PlatformChildFactory(key), false)); - node.setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/places/folder.png"); + node.setIconBaseWithExtension("com/github/kayak/logging/icons/folder.svg"); node.setDisplayName(key); return new Node[] {node}; diff --git a/Kayak-logging/src/main/java/com/github/kayak/logging/LogFileNode.java b/Kayak-logging/src/main/java/com/github/kayak/logging/LogFileNode.java index 4c7b4d7..27eaa8b 100644 --- a/Kayak-logging/src/main/java/com/github/kayak/logging/LogFileNode.java +++ b/Kayak-logging/src/main/java/com/github/kayak/logging/LogFileNode.java @@ -53,7 +53,7 @@ public LogFileNode(LogFile logFile) { this.setDisplayName(logFile.getDescription()); this.setShortDescription(logFile.getFileName()); - this.setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/apps/accessories-text-editor.png"); + this.setIconBaseWithExtension("com/github/kayak/logging/icons/accessories-text-editor.png"); } @Override diff --git a/Kayak-logging/src/main/java/com/github/kayak/logging/LogFilesNodeFactory.java b/Kayak-logging/src/main/java/com/github/kayak/logging/LogFilesNodeFactory.java index d2d47cd..726f25f 100644 --- a/Kayak-logging/src/main/java/com/github/kayak/logging/LogFilesNodeFactory.java +++ b/Kayak-logging/src/main/java/com/github/kayak/logging/LogFilesNodeFactory.java @@ -44,12 +44,12 @@ protected Node[] createNodesForKey(Folders key) { if(key == Folders.DIRECTORY) { AbstractNode node = new AbstractNode(Children.create(new LogDirectoryFactory(), true)); node.setDisplayName("Log directory"); - node.setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/places/folder.png"); + node.setIconBaseWithExtension("com/github/kayak/logging/icons/folder.png"); return new Node[] {node}; } else if(key == Folders.FAVOURTIES) { AbstractNode node = new AbstractNode(Children.create(new LogFavouritesFactory(), true)); node.setDisplayName("Favourites"); - node.setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/actions/bookmark-new.png"); + node.setIconBaseWithExtension("com/github/kayak/logging/icons/bookmark-new.png"); return new Node[] {node}; } diff --git a/Kayak-logging/src/main/java/com/github/kayak/logging/LogFilesTopComponent.java b/Kayak-logging/src/main/java/com/github/kayak/logging/LogFilesTopComponent.java index f14d87e..1372436 100644 --- a/Kayak-logging/src/main/java/com/github/kayak/logging/LogFilesTopComponent.java +++ b/Kayak-logging/src/main/java/com/github/kayak/logging/LogFilesTopComponent.java @@ -36,7 +36,7 @@ @ConvertAsProperties(dtd = "-//com.github.kayak.ui.logfiles//LogFiles//EN", autostore = false) @TopComponent.Description(preferredID = "LogFilesTopComponent", -iconBase="org/tango-project/tango-icon-theme/16x16/apps/accessories-text-editor.png", +iconBase="com/github/kayak/logging/icons/accessories-text-editor.png", persistenceType = TopComponent.PERSISTENCE_ALWAYS) @TopComponent.Registration(mode = "management", openAtStartup = true) @ActionID(category = "Window", id = "com.github.kayak.logging.LogFilesTopComponent") diff --git a/Kayak-logging/src/main/java/com/github/kayak/logging/OpenLogFileAction.java b/Kayak-logging/src/main/java/com/github/kayak/logging/OpenLogFileAction.java index 39cc5ef..82b4d8e 100644 --- a/Kayak-logging/src/main/java/com/github/kayak/logging/OpenLogFileAction.java +++ b/Kayak-logging/src/main/java/com/github/kayak/logging/OpenLogFileAction.java @@ -17,7 +17,7 @@ * * @author Jan-Niklas Meier */ -@ActionRegistration(displayName = "Open Log file...", iconBase = "org/tango-project/tango-icon-theme/16x16/actions/document-open.png", iconInMenu = true, surviveFocusChange = true) +@ActionRegistration(displayName = "Open Log file...", iconBase = "com/github/kayak/logging/icons/document-open.png", iconInMenu = true, surviveFocusChange = true) @ActionID(category = "Log files", id = "com.github.kayak.logging.OpenLogFileAction") @ActionReferences(value = { @ActionReference(path = "Menu/Log files", position = 10)}) diff --git a/Kayak-logging/src/main/java/com/github/kayak/logging/input/LogInputTopComponent.java b/Kayak-logging/src/main/java/com/github/kayak/logging/input/LogInputTopComponent.java index 094b65c..ab9511f 100644 --- a/Kayak-logging/src/main/java/com/github/kayak/logging/input/LogInputTopComponent.java +++ b/Kayak-logging/src/main/java/com/github/kayak/logging/input/LogInputTopComponent.java @@ -46,7 +46,7 @@ @ConvertAsProperties(dtd = "-//com.github.kayak.logging.input//LogInput//EN", autostore = false) @TopComponent.Description(preferredID = "LogInputTopComponent", -iconBase="org/tango-project/tango-icon-theme/16x16/actions/go-previous.png", +iconBase="com/github/kayak/logging/icons/go-previous.png", persistenceType = TopComponent.PERSISTENCE_ONLY_OPENED) @TopComponent.Registration(mode = "properties", openAtStartup = false) public final class LogInputTopComponent extends TopComponent implements BusDropTargetAdapter.BusDropReceiver { diff --git a/Kayak-logging/src/main/java/com/github/kayak/logging/output/LogOutputTopComponent.java b/Kayak-logging/src/main/java/com/github/kayak/logging/output/LogOutputTopComponent.java index 6b17ec3..5526ed4 100644 --- a/Kayak-logging/src/main/java/com/github/kayak/logging/output/LogOutputTopComponent.java +++ b/Kayak-logging/src/main/java/com/github/kayak/logging/output/LogOutputTopComponent.java @@ -37,7 +37,7 @@ @ConvertAsProperties(dtd = "-//com.github.kayak.ui.logfiles//LogOutput//EN", autostore = false) @TopComponent.Description(preferredID = "LogOutputTopComponent", -iconBase="org/tango-project/tango-icon-theme/16x16/actions/go-next.png", +iconBase="com/github/kayak/logging/icons/go-next.png", persistenceType = TopComponent.PERSISTENCE_NEVER) @TopComponent.Registration(mode = "properties", openAtStartup = false) @ActionID(category = "Log files", id = "com.github.kayak.logging.LogOutputTopComponent") diff --git a/Kayak-logging/src/main/java/com/github/kayak/logging/snapshots/CreateSnapshotAction.java b/Kayak-logging/src/main/java/com/github/kayak/logging/snapshots/CreateSnapshotAction.java index 16c539d..c4b27c7 100644 --- a/Kayak-logging/src/main/java/com/github/kayak/logging/snapshots/CreateSnapshotAction.java +++ b/Kayak-logging/src/main/java/com/github/kayak/logging/snapshots/CreateSnapshotAction.java @@ -33,7 +33,7 @@ * * @author Jan-Niklas Meier */ -@ActionRegistration(displayName = "Create snapshot", iconBase = "org/tango-project/tango-icon-theme/16x16/devices/camera-photo.png", iconInMenu = true, surviveFocusChange = true, asynchronous=true) +@ActionRegistration(displayName = "Create snapshot", iconBase = "com/github/kayak/logging/icons/camera-photo.png", iconInMenu = true, surviveFocusChange = true, asynchronous=true) @ActionID(category = "Log files", id = "com.github.kayak.logging.snapshots.CreateSnapshotAction") @ActionReferences(value = { @ActionReference(path = "Menu/Log files", position = 70), diff --git a/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/accessories-text-editor.png b/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/accessories-text-editor.png new file mode 100644 index 0000000..188e1c1 Binary files /dev/null and b/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/accessories-text-editor.png differ diff --git a/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/bookmark-new.png b/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/bookmark-new.png new file mode 100644 index 0000000..6cf6443 Binary files /dev/null and b/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/bookmark-new.png differ diff --git a/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/camera-photo.png b/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/camera-photo.png new file mode 100644 index 0000000..1e8e886 Binary files /dev/null and b/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/camera-photo.png differ diff --git a/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/document-open.png b/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/document-open.png new file mode 100644 index 0000000..ab94046 Binary files /dev/null and b/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/document-open.png differ diff --git a/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/edit-delete.png b/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/edit-delete.png new file mode 100644 index 0000000..ea03150 Binary files /dev/null and b/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/edit-delete.png differ diff --git a/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/folder.png b/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/folder.png new file mode 100644 index 0000000..65bd0bb Binary files /dev/null and b/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/folder.png differ diff --git a/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/go-previous.png b/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/go-previous.png new file mode 100644 index 0000000..659cd90 Binary files /dev/null and b/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/go-previous.png differ diff --git a/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/package-x-generic.png b/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/package-x-generic.png new file mode 100644 index 0000000..9015426 Binary files /dev/null and b/Kayak-logging/src/main/resources/com/github/kayak/logging/icons/package-x-generic.png differ diff --git a/Kayak-mapview/pom.xml b/Kayak-mapview/pom.xml index 419efed..16b3527 100644 --- a/Kayak-mapview/pom.xml +++ b/Kayak-mapview/pom.xml @@ -38,32 +38,32 @@ org.netbeans.api org-netbeans-api-annotations-common - RELEASE80 + RELEASE82 org.netbeans.api org-openide-windows - RELEASE80 + RELEASE82 org.netbeans.api org-openide-util - RELEASE80 + RELEASE82 org.netbeans.api org-openide-util-lookup - RELEASE80 + RELEASE82 org.netbeans.api org-openide-awt - RELEASE80 + RELEASE82 org.netbeans.api org-netbeans-modules-settings - RELEASE80 + RELEASE82 ${project.groupId} @@ -85,11 +85,6 @@ swingx-core 1.6.2-2 - - org.tango-project - tango-icon-theme - 0.8.0 - @@ -97,7 +92,7 @@ org.codehaus.mojo nbm-maven-plugin - 3.13 + 3.13.3 true @@ -105,7 +100,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.0 + 3.8.0 1.7 1.7 @@ -115,7 +110,7 @@ org.apache.maven.plugins maven-jar-plugin - 2.3.2 + 2.6 true diff --git a/Kayak-mapview/src/main/java/com/github/kayak/mapview/MapViewTopComponent.java b/Kayak-mapview/src/main/java/com/github/kayak/mapview/MapViewTopComponent.java index b2320c6..9653438 100644 --- a/Kayak-mapview/src/main/java/com/github/kayak/mapview/MapViewTopComponent.java +++ b/Kayak-mapview/src/main/java/com/github/kayak/mapview/MapViewTopComponent.java @@ -50,7 +50,7 @@ @ConvertAsProperties(dtd = "-//com.github.kayak.mapview//MapView//EN", autostore = false) @TopComponent.Description(preferredID = "MapViewTopComponent", -iconBase="org/tango-project/tango-icon-theme/16x16/apps/internet-web-browser.png", +iconBase="com/github/kayak/mapview/icons/internet-web-browser.png", persistenceType = TopComponent.PERSISTENCE_ALWAYS) @TopComponent.Registration(mode = "editor", openAtStartup = false) public final class MapViewTopComponent extends TopComponent { diff --git a/Kayak-mapview/src/main/java/com/github/kayak/mapview/OpenMapViewAction.java b/Kayak-mapview/src/main/java/com/github/kayak/mapview/OpenMapViewAction.java index 34a913f..2ad0c11 100644 --- a/Kayak-mapview/src/main/java/com/github/kayak/mapview/OpenMapViewAction.java +++ b/Kayak-mapview/src/main/java/com/github/kayak/mapview/OpenMapViewAction.java @@ -27,7 +27,7 @@ @ActionID(category = "BusViews", id = "com.github.kayak.mapview.OpenMapViewAction") @ActionRegistration(displayName = "#CTL_OpenMapView", - iconBase="org/tango-project/tango-icon-theme/16x16/apps/internet-web-browser.png") + iconBase="com/github/kayak/mapview/icons/internet-web-browser.png") @ActionReferences(value = { @ActionReference(path = "Menu/Bus views", position = 15), @ActionReference(path = "Toolbars/Bus views", position = 15) diff --git a/Kayak-mapview/src/main/resources/com/github/kayak/mapview/icons/internet-web-browser.png b/Kayak-mapview/src/main/resources/com/github/kayak/mapview/icons/internet-web-browser.png new file mode 100644 index 0000000..ac5957a Binary files /dev/null and b/Kayak-mapview/src/main/resources/com/github/kayak/mapview/icons/internet-web-browser.png differ diff --git a/Kayak-ui/pom.xml b/Kayak-ui/pom.xml index 008cb4c..2e9660f 100644 --- a/Kayak-ui/pom.xml +++ b/Kayak-ui/pom.xml @@ -23,37 +23,42 @@ org.netbeans.api org-openide-util - RELEASE80 + RELEASE82 + + + org.netbeans.api + org-openide-util-ui + RELEASE82 org.netbeans.api org-openide-windows - RELEASE80 + RELEASE82 org.netbeans.api org-openide-util-lookup - RELEASE80 + RELEASE82 org.netbeans.api org-openide-awt - RELEASE80 + RELEASE82 org.netbeans.api org-netbeans-modules-settings - RELEASE80 + RELEASE82 org.netbeans.api org-openide-nodes - RELEASE80 + RELEASE82 org.netbeans.api org-openide-explorer - RELEASE80 + RELEASE82 com.github.kayak @@ -64,43 +69,38 @@ org.netbeans.api org-openide-loaders - RELEASE80 + RELEASE82 org.netbeans.api org-openide-filesystems - RELEASE80 + RELEASE82 org.netbeans.api org-openide-io - RELEASE80 + RELEASE82 org.netbeans.api org-openide-modules - RELEASE80 + RELEASE82 org-openide-text org.netbeans.api jar - RELEASE80 + RELEASE82 org.netbeans.api org-netbeans-modules-options-api - RELEASE80 + RELEASE82 eu.hansolo SteelSeries - 3.9.6 - - - org.tango-project - tango-icon-theme - 0.8.0 + 3.9.30 @@ -119,13 +119,13 @@ com.github.kayak.ui.useroutput - 3.13 + 3.13.3 org.apache.maven.plugins maven-jar-plugin - 2.3.2 + 2.6 true diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/connections/BookmarkConnectionAction.java b/Kayak-ui/src/main/java/com/github/kayak/ui/connections/BookmarkConnectionAction.java index 44120a8..280062f 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/connections/BookmarkConnectionAction.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/connections/BookmarkConnectionAction.java @@ -12,7 +12,7 @@ import org.openide.awt.ActionReferences; import org.openide.awt.ActionRegistration; -@ActionRegistration(displayName="Bookmark connection...", iconBase="org/tango-project/tango-icon-theme/16x16/actions/bookmark-new.png", iconInMenu=true, surviveFocusChange=true) +@ActionRegistration(displayName="Bookmark connection...", iconBase="com/github/kayak/ui/icons/bookmark-new.png", iconInMenu=true, surviveFocusChange=true) @ActionID(category="Connections", id="com.github.kayak.ui.connections.BookmarkConnectionAction") @ActionReferences(value = { @ActionReference(path="Menu/Connections", position=30)}) diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/connections/BusURLNode.java b/Kayak-ui/src/main/java/com/github/kayak/ui/connections/BusURLNode.java index 9a53504..8d74b50 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/connections/BusURLNode.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/connections/BusURLNode.java @@ -66,9 +66,9 @@ public TestConnectionAction() { public void actionPerformed(ActionEvent e) { Boolean result = url.checkConnection(); if(!result) - setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/emblems/emblem-unreadable.png"); + setIconBaseWithExtension("com/github/kayak/ui/icons/emblem-unreadable.png"); else - setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/devices/network-wired.png"); + setIconBaseWithExtension("com/github/kayak/ui/icons/network-wired.png"); } } @@ -77,7 +77,7 @@ public BusURLNode(BusURL url, Type type) { this.url = url; setDisplayName(url.toString()); this.type = type; - setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/devices/network-wired.png"); + setIconBaseWithExtension("com/github/kayak/ui/icons/network-wired.png"); } @Override diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/connections/ConnectionNodeFactory.java b/Kayak-ui/src/main/java/com/github/kayak/ui/connections/ConnectionNodeFactory.java index de3b30f..9340efc 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/connections/ConnectionNodeFactory.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/connections/ConnectionNodeFactory.java @@ -49,17 +49,17 @@ protected Node[] createNodesForKey(Object key) { case DISCOVERY: AbstractNode discoveryNode = new AbstractNode(new ConnectionChildrenFactory(BusURLNode.Type.DISCOVERY)); discoveryNode.setDisplayName("Auto discovery"); - discoveryNode.setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/devices/network-wireless.png"); + discoveryNode.setIconBaseWithExtension("com/github/kayak/ui/icons/network-wireless.png"); return new Node[] { discoveryNode }; case FAVOURITES: AbstractNode favouritesFolderNode = new AbstractNode(new ConnectionChildrenFactory(BusURLNode.Type.FAVOURITE)); favouritesFolderNode.setDisplayName("Favourites"); - favouritesFolderNode.setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/actions/bookmark-new.png"); + favouritesFolderNode.setIconBaseWithExtension("com/github/kayak/ui/icons/bookmark-new.png"); return new Node[] { favouritesFolderNode }; case RECENT: AbstractNode recentFolderNode = new AbstractNode(new ConnectionChildrenFactory(BusURLNode.Type.RECENT)); recentFolderNode.setDisplayName("Recent"); - recentFolderNode.setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/places/folder.png"); + recentFolderNode.setIconBaseWithExtension("com/github/kayak/ui/icons/folder.png"); return new Node[] { recentFolderNode }; default: return null; diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/connections/ConnectionsTopComponent.java b/Kayak-ui/src/main/java/com/github/kayak/ui/connections/ConnectionsTopComponent.java index c671346..9f08d7a 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/connections/ConnectionsTopComponent.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/connections/ConnectionsTopComponent.java @@ -23,7 +23,7 @@ @ConvertAsProperties(dtd = "-//com.github.kayak.ui//Connections//EN", autostore = false) @TopComponent.Description(preferredID = "ConnectionsTopComponent", -iconBase="org/tango-project/tango-icon-theme/16x16/devices/network-wireless.png", +iconBase="com/github/kayak/ui/icons/network-wireless.png", persistenceType = TopComponent.PERSISTENCE_ALWAYS) @TopComponent.Registration(mode = "management", openAtStartup = true) @ActionID(category = "Window", id = "com.github.kayak.ui.connections.ConnectionsTopComponent") diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/connections/DeleteConnectionAction.java b/Kayak-ui/src/main/java/com/github/kayak/ui/connections/DeleteConnectionAction.java index 04ba087..4c778fd 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/connections/DeleteConnectionAction.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/connections/DeleteConnectionAction.java @@ -11,7 +11,7 @@ import org.openide.awt.ActionReferences; import org.openide.awt.ActionRegistration; -@ActionRegistration(displayName="Delete connection...", iconBase="org/tango-project/tango-icon-theme/16x16/actions/edit-delete.png", iconInMenu=true, surviveFocusChange=true) +@ActionRegistration(displayName="Delete connection...", iconBase="com/github/kayak/ui/icons/edit-delete.png", iconInMenu=true, surviveFocusChange=true) @ActionID(category="Connections", id="com.github.kayak.ui.connections.DeleteConnectionAction") @ActionReferences(value = { @ActionReference(path="Menu/Connections", position=40)}) diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/connections/NewConnectionAction.java b/Kayak-ui/src/main/java/com/github/kayak/ui/connections/NewConnectionAction.java index a7b2ef1..0d4c543 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/connections/NewConnectionAction.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/connections/NewConnectionAction.java @@ -28,7 +28,7 @@ import org.openide.awt.ActionRegistration; @ActionID(id = "com.github.kayak.ui.connections.NewConnectionAction", category = "Connections") -@ActionRegistration(iconInMenu = true, displayName = "#CTL_NewConnectionAction", iconBase = "org/tango-project/tango-icon-theme/16x16/actions/document-new.png") +@ActionRegistration(iconInMenu = true, displayName = "#CTL_NewConnectionAction", iconBase = "com/github/kayak/ui/icons/document-new.png") @ActionReferences(value = { @ActionReference(path = "Menu/Connections", position = 20)}) public final class NewConnectionAction implements ActionListener { diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/descriptions/CreateProjectAction.java b/Kayak-ui/src/main/java/com/github/kayak/ui/descriptions/CreateProjectAction.java index 7f0a661..098a294 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/descriptions/CreateProjectAction.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/descriptions/CreateProjectAction.java @@ -33,7 +33,7 @@ * * @author Jan-Niklas Meier < dschanoeh@googlemail.com > */ -@ActionRegistration(displayName="Create project...", iconBase="org/tango-project/tango-icon-theme/16x16/mimetypes/package-x-generic.png", iconInMenu=true, surviveFocusChange=true) +@ActionRegistration(displayName="Create project...", iconBase="com/github/kayak/ui/icons/package-x-generic.png", iconInMenu=true, surviveFocusChange=true) @ActionID(category="Descriptions", id="com.github.kayak.ui.descriptions.CreateProjectAction") @ActionReferences(value = { @ActionReference(path="Menu/Descriptions", position=30)}) diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/descriptions/DescriptionNode.java b/Kayak-ui/src/main/java/com/github/kayak/ui/descriptions/DescriptionNode.java index 62ee4a3..c9dcb10 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/descriptions/DescriptionNode.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/descriptions/DescriptionNode.java @@ -72,7 +72,7 @@ public DescriptionNode(BusDescription d) { this.description = d; setDisplayName(description.getName()); - this.setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/places/network-workgroup.png"); + this.setIconBaseWithExtension("com/github/kayak/ui/icons/network-workgroup.png"); } @Override diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/descriptions/DescriptionsTopComponent.java b/Kayak-ui/src/main/java/com/github/kayak/ui/descriptions/DescriptionsTopComponent.java index 56725d5..a141e36 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/descriptions/DescriptionsTopComponent.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/descriptions/DescriptionsTopComponent.java @@ -23,7 +23,7 @@ @ConvertAsProperties(dtd = "-//com.github.kayak.ui.descriptions//Descriptions//EN", autostore = false) @TopComponent.Description(preferredID = "DescriptionsTopComponent", -iconBase="org/tango-project/tango-icon-theme/16x16/mimetypes/text-x-generic.png", +iconBase="com/github/kayak/ui/icons/text-x-generic.png", persistenceType = TopComponent.PERSISTENCE_ALWAYS) @TopComponent.Registration(mode = "management", openAtStartup = true) @ActionID(category = "Window", id = "com.github.kayak.ui.descriptions.DescriptionsTopComponent") diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/descriptions/DocumentNode.java b/Kayak-ui/src/main/java/com/github/kayak/ui/descriptions/DocumentNode.java index a481757..eb713ed 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/descriptions/DocumentNode.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/descriptions/DocumentNode.java @@ -44,7 +44,7 @@ public DocumentNode(Document document) { super(Children.create(new DocumentChildrenFactory(document), true), Lookups.fixed(document)); this.document = document; setName(document.getName()); - setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/mimetypes/text-x-generic.png"); + setIconBaseWithExtension("com/github/kayak/ui/icons/text-x-generic.png"); } @Override diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/gaugeview/GaugeTopComponent.java b/Kayak-ui/src/main/java/com/github/kayak/ui/gaugeview/GaugeTopComponent.java index 7bcd05d..34efd30 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/gaugeview/GaugeTopComponent.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/gaugeview/GaugeTopComponent.java @@ -43,7 +43,7 @@ @ConvertAsProperties(dtd = "-//com.github.kayak.ui.gaugeview//Gauge//EN", autostore = false) @TopComponent.Description(preferredID = "GaugeTopComponent", -iconBase="org/tango-project/tango-icon-theme/16x16/actions/appointment-new.png", +iconBase="com/github/kayak/ui/icons/appointment-new.png", persistenceType = TopComponent.PERSISTENCE_ONLY_OPENED) @TopComponent.Registration(mode = "editor", openAtStartup = false) public final class GaugeTopComponent extends TopComponent { diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/gaugeview/OpenGaugeViewAction.java b/Kayak-ui/src/main/java/com/github/kayak/ui/gaugeview/OpenGaugeViewAction.java index 756dff2..a759abf 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/gaugeview/OpenGaugeViewAction.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/gaugeview/OpenGaugeViewAction.java @@ -28,7 +28,7 @@ * * @author Jan-Niklas Meier */ -@ActionRegistration(displayName="Open gauge view", iconBase="org/tango-project/tango-icon-theme/16x16/actions/appointment-new.png", iconInMenu=true, surviveFocusChange=true) +@ActionRegistration(displayName="Open gauge view", iconBase="com/github/kayak/ui/icons/appointment-new.png", iconInMenu=true, surviveFocusChange=true) @ActionID(category="BusViews", id="com.github.kayak.ui.gaugeview.OpenGaugeViewAction") @ActionReferences( value= { @ActionReference(path = "Menu/Bus views", position = 10), diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/BusNode.java b/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/BusNode.java index 125b9cc..176ba07 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/BusNode.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/BusNode.java @@ -32,7 +32,7 @@ public class BusNode extends AbstractNode { public BusNode(BusDescription desc, Bus bus) { super(Children.create(new MessageNodeFactory(desc, bus), true)); - setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/places/network-workgroup.png"); + setIconBaseWithExtension("com/github/kayak/ui/icons/network-workgroup.png"); setDisplayName(bus.getName() + " (" + desc.getName() + ")"); } diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MessageDescriptionNode.java b/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MessageDescriptionNode.java index 5b400b6..543ac33 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MessageDescriptionNode.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MessageDescriptionNode.java @@ -55,7 +55,7 @@ public MessageDescriptionNode(MessageDescription messageDescription, Bus bus) { this.description = messageDescription; this.bus = bus; setDisplayName(description.getName()); - setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/apps/internet-mail.png"); + setIconBaseWithExtension("com/github/kayak/ui/icons/internet-mail.png"); } @Override diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MessageViewTopComponent.form b/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MessageViewTopComponent.form index 1a8a90a..e0f2c8b 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MessageViewTopComponent.form +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MessageViewTopComponent.form @@ -1,4 +1,4 @@ - +
@@ -25,7 +25,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MessageViewTopComponent.java b/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MessageViewTopComponent.java index ab7aba0..90f84fd 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MessageViewTopComponent.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MessageViewTopComponent.java @@ -31,7 +31,7 @@ @ConvertAsProperties(dtd = "-//com.github.kayak.ui.messageview//MessageView//EN", autostore = false) @TopComponent.Description(preferredID = "MessageViewTopComponent", -iconBase="org/tango-project/tango-icon-theme/16x16/status/dialog-information.png", +iconBase="com/github/kayak/ui/icons/dialog-information.png", persistenceType = TopComponent.PERSISTENCE_ALWAYS) @TopComponent.Registration(mode = "editor", openAtStartup = false) public final class MessageViewTopComponent extends TopComponent { @@ -74,7 +74,7 @@ private void initComponents() { jToolBar1.setFloatable(false); jToolBar1.setRollover(true); - jButton1.setIcon(new ImageIcon(ImageUtilities.loadImage("org/tango-project/tango-icon-theme/16x16/actions/edit-delete.png"))); + jButton1.setIcon(new ImageIcon(ImageUtilities.loadImage("com/github/kayak/ui/icons/edit-delete.png"))); org.openide.awt.Mnemonics.setLocalizedText(jButton1, org.openide.util.NbBundle.getMessage(MessageViewTopComponent.class, "MessageViewTopComponent.jButton1.text")); // NOI18N jButton1.setFocusable(false); jButton1.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER); @@ -116,7 +116,7 @@ public void itemStateChanged(java.awt.event.ItemEvent evt) { .addGroup(layout.createSequentialGroup() .addComponent(jToolBar1, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 402, Short.MAX_VALUE)) + .addComponent(jScrollPane1)) ); }// //GEN-END:initComponents diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MessagesTopComponent.java b/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MessagesTopComponent.java index 0add871..7d43276 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MessagesTopComponent.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MessagesTopComponent.java @@ -32,7 +32,7 @@ @ConvertAsProperties(dtd = "-//com.github.kayak.ui.messageview//Messages//EN", autostore = false) @TopComponent.Description(preferredID = "MessagesTopComponent", -iconBase="org/tango-project/tango-icon-theme/16x16/status/dialog-information.png", +iconBase="com/github/kayak/ui/icons/dialog-information.png", persistenceType = TopComponent.PERSISTENCE_ALWAYS) @ActionID(category = "Window", id = "com.github.kayak.ui.messageview.MessagesTopComponent") @ActionReference(path = "Menu/Window" /*, position = 333 */) diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MultiplexDescriptionNode.java b/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MultiplexDescriptionNode.java index 5011f43..8ac3eee 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MultiplexDescriptionNode.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/MultiplexDescriptionNode.java @@ -56,7 +56,7 @@ public MultiplexDescriptionNode(MultiplexDescription signalDescription, Bus bus) this.bus = bus; setDisplayName(description.getName()); - setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/apps/accessories-calculator.png"); + setIconBaseWithExtension("com/github/kayak/ui/icons/accessories-calculator.png"); } @Override diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/OpenMessageViewAction.java b/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/OpenMessageViewAction.java index f088001..190cd9d 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/OpenMessageViewAction.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/OpenMessageViewAction.java @@ -32,7 +32,7 @@ @ActionID(category = "BusViews", id = "com.github.kayak.ui.messageview.OpenMessageViewAction") @ActionRegistration(displayName = "#CTL_OpenMessageViewAction", - iconBase="org/tango-project/tango-icon-theme/16x16/status/dialog-information.png") + iconBase="com/github/kayak/ui/icons/dialog-information.png") @ActionReferences(value = { @ActionReference(path = "Menu/Bus views", position = 5), @ActionReference(path = "Toolbars/Bus views", position = 5) diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/SignalDescriptionNode.java b/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/SignalDescriptionNode.java index dc46754..7ccb7fa 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/SignalDescriptionNode.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/messageview/SignalDescriptionNode.java @@ -60,7 +60,7 @@ public SignalDescriptionNode(SignalDescription signalDescription, Bus bus) { this.bus = bus; setDisplayName(signalDescription.getName()); - setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/status/dialog-information.png"); + setIconBaseWithExtension("com/github/kayak/ui/icons/dialog-information.png"); } @Override diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/projects/BusNode.java b/Kayak-ui/src/main/java/com/github/kayak/ui/projects/BusNode.java index c70a093..acf47d8 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/projects/BusNode.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/projects/BusNode.java @@ -74,7 +74,7 @@ public void aliasChanged(String newAlias) { public BusNode(Bus bus, Project project) { super(new BusChildFactory(bus, project), Lookups.fixed(bus, project)); - setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/places/network-workgroup.png"); + setIconBaseWithExtension("com/github/kayak/ui/icons/network-workgroup.png"); super.setDisplayName(bus.toString()); this.bus = bus; this.project = project; diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/projects/ConnectedBusURLNode.java b/Kayak-ui/src/main/java/com/github/kayak/ui/projects/ConnectedBusURLNode.java index 08cadd4..0092da7 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/projects/ConnectedBusURLNode.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/projects/ConnectedBusURLNode.java @@ -97,7 +97,7 @@ public ConnectedBusURLNode(BusURL url, Bus bus, Project project) { } else { setDisplayName("Connection: " + url.toString()); } - setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/devices/network-wired.png"); + setIconBaseWithExtension("com/github/kayak/ui/icons/network-wired.png"); } @Override diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/projects/ConnectedDescriptionNode.java b/Kayak-ui/src/main/java/com/github/kayak/ui/projects/ConnectedDescriptionNode.java index a79b092..13bb12d 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/projects/ConnectedDescriptionNode.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/projects/ConnectedDescriptionNode.java @@ -85,7 +85,7 @@ public ConnectedDescriptionNode(Bus bus) { else setDisplayName("Description: " + description.getName()); - setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/mimetypes/text-x-generic.png"); + setIconBaseWithExtension("com/github/kayak/ui/icons/text-x-generic.png"); } @Override diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/projects/DeleteProjectAction.java b/Kayak-ui/src/main/java/com/github/kayak/ui/projects/DeleteProjectAction.java index 7c5cf41..e50f79a 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/projects/DeleteProjectAction.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/projects/DeleteProjectAction.java @@ -25,7 +25,7 @@ import org.openide.awt.ActionRegistration; @ActionID(id = "com.github.kayak.ui.projects.DeleteProjectAction", category = "File") -@ActionRegistration(iconInMenu = true, displayName = "#CTL_DeleteProject", iconBase = "org/tango-project/tango-icon-theme/16x16/actions/edit-delete.png") +@ActionRegistration(iconInMenu = true, displayName = "#CTL_DeleteProject", iconBase = "com/github/kayak/ui/icons/edit-delete.png") @ActionReferences(value = { @ActionReference(path = "Actions/Projects", position = 30 ), @ActionReference(path = "Menu/File", name = "com-github-kayak-ui-projects-NewProject", position = 30)}) diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/projects/NewBusAction.java b/Kayak-ui/src/main/java/com/github/kayak/ui/projects/NewBusAction.java index 4dae57a..c26730f 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/projects/NewBusAction.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/projects/NewBusAction.java @@ -13,7 +13,7 @@ import org.openide.awt.ActionReferences; import org.openide.awt.ActionRegistration; -@ActionRegistration(displayName="New bus...", iconBase="org/tango-project/tango-icon-theme/16x16/places/network-workgroup.png", iconInMenu=true, surviveFocusChange=true) +@ActionRegistration(displayName="New bus...", iconBase="com/github/kayak/ui/icons/network-workgroup.png", iconInMenu=true, surviveFocusChange=true) @ActionID(category="File", id="com.github.kayak.ui.projects.NewBusAction") @ActionReferences( value= { @ActionReference(path = "Shortcuts", name = "D-B"), diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/projects/NewProjectAction.java b/Kayak-ui/src/main/java/com/github/kayak/ui/projects/NewProjectAction.java index 55a3b14..955f037 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/projects/NewProjectAction.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/projects/NewProjectAction.java @@ -13,7 +13,7 @@ import org.openide.awt.ActionRegistration; @ActionID(id = "com.github.kayak.ui.projects.NewProjectAction", category = "File") -@ActionRegistration(iconInMenu = true, displayName = "#CTL_NewProject", iconBase = "org/tango-project/tango-icon-theme/16x16/actions/document-new.png") +@ActionRegistration(iconInMenu = true, displayName = "#CTL_NewProject", iconBase = "com/github/kayak/ui/icons/document-new.png") @ActionReferences(value = { @ActionReference(path = "Shortcuts", name = "D-N"), @ActionReference(path = "Actions/Projects", position = 10 ), diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/projects/ProjectNode.java b/Kayak-ui/src/main/java/com/github/kayak/ui/projects/ProjectNode.java index ece215d..0a83120 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/projects/ProjectNode.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/projects/ProjectNode.java @@ -49,12 +49,12 @@ public void projectNameChanged(Project p, String name) { @Override public void projectClosed(Project p) { setChildren(Children.LEAF); - setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/places/folder.png"); + setIconBaseWithExtension("com/github/kayak/ui/icons/folder.png"); } @Override public void projectOpened(Project p) { - setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/status/folder-open.png"); + setIconBaseWithExtension("com/github/kayak/ui/icons/folder-open.png"); setChildren(Children.create(new ProjectChildFactory(project), true)); } @@ -71,14 +71,14 @@ public void projectBusRemoved(Project p, Bus bus) { public ProjectNode(Project project) { super(Children.LEAF, Lookups.fixed(project)); - setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/places/folder.png"); + setIconBaseWithExtension("com/github/kayak/ui/icons/folder.png"); this.project = project; project.addProjectChangeListener(changeListener); if (project.isOpened()) { setChildren(Children.create(new ProjectChildFactory(project), true)); - setIconBaseWithExtension("org/tango-project/tango-icon-theme/16x16/status/folder-open.png"); + setIconBaseWithExtension("com/github/kayak/ui/icons/folder-open.png"); } super.setDisplayName(project.getName()); diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/projects/ProjectsTopComponent.java b/Kayak-ui/src/main/java/com/github/kayak/ui/projects/ProjectsTopComponent.java index efc5ca5..ab3d651 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/projects/ProjectsTopComponent.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/projects/ProjectsTopComponent.java @@ -27,7 +27,7 @@ @ConvertAsProperties(dtd = "-//com.github.kayak.ui.projects//Projects//EN", autostore = false) @TopComponent.Description(preferredID = "ProjectsTopComponent", -iconBase="org/tango-project/tango-icon-theme/16x16/mimetypes/package-x-generic.png", +iconBase="com/github/kayak/ui/icons/package-x-generic.png", persistenceType = TopComponent.PERSISTENCE_ALWAYS) @TopComponent.Registration(mode = "explorer", openAtStartup = true) @ActionID(category = "Window", id = "com.github.kayak.ui.projects.ProjectsTopComponent") diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/rawview/OpenRawViewAction.java b/Kayak-ui/src/main/java/com/github/kayak/ui/rawview/OpenRawViewAction.java index f9d40ee..c263695 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/rawview/OpenRawViewAction.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/rawview/OpenRawViewAction.java @@ -26,7 +26,7 @@ import org.openide.awt.ActionReferences; import org.openide.awt.ActionRegistration; -@ActionRegistration(displayName="Open RAW view", iconBase="org/tango-project/tango-icon-theme/16x16/mimetypes/text-x-generic.png", iconInMenu=true, surviveFocusChange=true) +@ActionRegistration(displayName="Open RAW view", iconBase="com/github/kayak/ui/icons/text-x-generic.png", iconInMenu=true, surviveFocusChange=true) @ActionID(category="BusViews", id="com.github.kayak.ui.rawview.OpenRawViewAction") @ActionReferences( value= { @ActionReference(path = "Menu/Bus views", position = 10), diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/rawview/RawViewTopComponent.java b/Kayak-ui/src/main/java/com/github/kayak/ui/rawview/RawViewTopComponent.java index a6a98e3..39bd347 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/rawview/RawViewTopComponent.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/rawview/RawViewTopComponent.java @@ -26,7 +26,7 @@ @ConvertAsProperties(dtd = "-//com.github.kayak.ui.rawview//RawView//EN", autostore = false) @TopComponent.Description(preferredID = "RawViewTopComponent", -iconBase="org/tango-project/tango-icon-theme/16x16/mimetypes/text-x-generic.png", +iconBase="com/github/kayak/ui/icons/text-x-generic.png", persistenceType = TopComponent.PERSISTENCE_ONLY_OPENED) @TopComponent.Registration(mode = "editor", openAtStartup = false) public final class RawViewTopComponent extends TopComponent { diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/send/OpenSendFramesAction.java b/Kayak-ui/src/main/java/com/github/kayak/ui/send/OpenSendFramesAction.java index 49ed7e0..02ae5c9 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/send/OpenSendFramesAction.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/send/OpenSendFramesAction.java @@ -28,7 +28,7 @@ * * @author Jan-Niklas Meier */ -@ActionRegistration(displayName="Open send view", iconBase="org/tango-project/tango-icon-theme/16x16/actions/mail-forward.png", iconInMenu=true, surviveFocusChange=true) +@ActionRegistration(displayName="Open send view", iconBase="com/github/kayak/ui/icons/mail-forward.png", iconInMenu=true, surviveFocusChange=true) @ActionID(category="Bus views", id="com.github.kayak.ui.send.SendFramesTopComponent") @ActionReferences( value= { @ActionReference(path = "Menu/Bus views"), diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/send/SendFramesTopComponent.java b/Kayak-ui/src/main/java/com/github/kayak/ui/send/SendFramesTopComponent.java index 8aa4d1a..122919e 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/send/SendFramesTopComponent.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/send/SendFramesTopComponent.java @@ -40,7 +40,7 @@ @ConvertAsProperties(dtd = "-//com.github.kayak.ui.send//SendFrames//EN", autostore = false) @TopComponent.Description(preferredID = "SendFramesTopComponent", -iconBase="org/tango-project/tango-icon-theme/16x16/actions/mail-forward.png", +iconBase="com/github/kayak/ui/icons/mail-forward.png", persistenceType = TopComponent.PERSISTENCE_ONLY_OPENED) @TopComponent.Registration(mode = "editor", openAtStartup = false) @TopComponent.OpenActionRegistration(displayName = "#CTL_SendFramesAction", diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/startpage/StartPageTopComponent.java b/Kayak-ui/src/main/java/com/github/kayak/ui/startpage/StartPageTopComponent.java index b0e7b97..39f744f 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/startpage/StartPageTopComponent.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/startpage/StartPageTopComponent.java @@ -9,7 +9,7 @@ @ConvertAsProperties(dtd = "-//com.github.kayak.ui.startpage//StartPage//EN", autostore = false) @TopComponent.Description(preferredID = "StartPageTopComponent", -iconBase="org/tango-project/tango-icon-theme/16x16/mimetypes/text-x-generic.png", +iconBase="com/github/kayak/ui/icons/text-x-generic.png", persistenceType = TopComponent.PERSISTENCE_ONLY_OPENED) @TopComponent.Registration(mode = "editor", openAtStartup = true) @ActionID(category = "Window", id = "com.github.kayak.ui.startpage.StartPageTopComponent") diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/statistics/BusStatisticsTopComponent.java b/Kayak-ui/src/main/java/com/github/kayak/ui/statistics/BusStatisticsTopComponent.java index 2d7c705..b337070 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/statistics/BusStatisticsTopComponent.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/statistics/BusStatisticsTopComponent.java @@ -34,7 +34,7 @@ @ConvertAsProperties(dtd = "-//com.github.kayak.ui.statistics//BusStatistics//EN", autostore = false) @TopComponent.Description(preferredID = "BusStatisticsTopComponent", -iconBase="org/tango-project/tango-icon-theme/16x16/apps/utilities-system-monitor.png", +iconBase="com/github/kayak/ui/icons/utilities-system-monitor.png", persistenceType = TopComponent.PERSISTENCE_ONLY_OPENED) @TopComponent.Registration(mode = "statistics", openAtStartup = false) public final class BusStatisticsTopComponent extends TopComponent { diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/statistics/OpenBusStatisticsAction.java b/Kayak-ui/src/main/java/com/github/kayak/ui/statistics/OpenBusStatisticsAction.java index 43c949c..3ac2375 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/statistics/OpenBusStatisticsAction.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/statistics/OpenBusStatisticsAction.java @@ -30,7 +30,7 @@ * * @author Jan-Niklas Meier */ -@ActionRegistration(displayName="Open bus statistics", iconBase="org/tango-project/tango-icon-theme/16x16/apps/utilities-system-monitor.png", iconInMenu=true, surviveFocusChange=true) +@ActionRegistration(displayName="Open bus statistics", iconBase="com/github/kayak/ui/icons/utilities-system-monitor.png", iconInMenu=true, surviveFocusChange=true) @ActionID(category="BusViews", id="com.github.kayak.ui.statistics.OpenBusStatisticsAction") @ActionReferences( value= { @ActionReference(path = "Menu/Bus views", position = 20 ), diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/time/PauseAction.java b/Kayak-ui/src/main/java/com/github/kayak/ui/time/PauseAction.java index e0c18f2..0a25b95 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/time/PauseAction.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/time/PauseAction.java @@ -13,7 +13,7 @@ @ActionID(category = "Time", id = "com.github.kayak.ui.time.PauseAction") -@ActionRegistration(iconBase = "org/tango-project/tango-icon-theme/16x16/actions/media-playback-pause.png", +@ActionRegistration(iconBase = "com/github/kayak/ui/icons/media-playback-pause.png", displayName = "com.github.kayak.ui.time.Bundle#CTL_PauseAction") @ActionReferences({ @ActionReference(path = "Toolbars/Time", position = 200), diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/time/PlayAction.java b/Kayak-ui/src/main/java/com/github/kayak/ui/time/PlayAction.java index b79b3ed..3a50f75 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/time/PlayAction.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/time/PlayAction.java @@ -13,7 +13,7 @@ @ActionID(category = "Time", id = "com.github.kayak.ui.time.PlayAction") -@ActionRegistration(iconBase = "org/tango-project/tango-icon-theme/16x16/actions/media-playback-start.png", +@ActionRegistration(iconBase = "com/github/kayak/ui/icons/media-playback-start.png", displayName = "com.github.kayak.ui.time.Bundle#CTL_PlayAction") @ActionReferences({ @ActionReference(path = "Toolbars/Time", position = 100), diff --git a/Kayak-ui/src/main/java/com/github/kayak/ui/time/StopAction.java b/Kayak-ui/src/main/java/com/github/kayak/ui/time/StopAction.java index b6a5c4b..01bd78c 100644 --- a/Kayak-ui/src/main/java/com/github/kayak/ui/time/StopAction.java +++ b/Kayak-ui/src/main/java/com/github/kayak/ui/time/StopAction.java @@ -13,7 +13,7 @@ @ActionID(category = "Time", id = "com.github.kayak.ui.time.StopAction") -@ActionRegistration(iconBase = "org/tango-project/tango-icon-theme/16x16/actions/media-playback-stop.png", +@ActionRegistration(iconBase = "com/github/kayak/ui/icons/media-playback-stop.png", displayName = "com.github.kayak.ui.time.Bundle#CTL_StopAction") @ActionReferences({ @ActionReference(path = "Toolbars/Time", position = 300), diff --git a/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/appointment-new.png b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/appointment-new.png new file mode 100644 index 0000000..18b7c67 Binary files /dev/null and b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/appointment-new.png differ diff --git a/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/bookmark-new.png b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/bookmark-new.png new file mode 100644 index 0000000..6cf6443 Binary files /dev/null and b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/bookmark-new.png differ diff --git a/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/dialog-information.png b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/dialog-information.png new file mode 100644 index 0000000..8851b99 Binary files /dev/null and b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/dialog-information.png differ diff --git a/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/document-new.png b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/document-new.png new file mode 100644 index 0000000..4c3efdd Binary files /dev/null and b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/document-new.png differ diff --git a/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/edit-delete.png b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/edit-delete.png new file mode 100644 index 0000000..ea03150 Binary files /dev/null and b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/edit-delete.png differ diff --git a/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/emblem-unreadable.png b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/emblem-unreadable.png new file mode 100644 index 0000000..5c08b05 Binary files /dev/null and b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/emblem-unreadable.png differ diff --git a/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/folder-open.png b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/folder-open.png new file mode 100644 index 0000000..b67403d Binary files /dev/null and b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/folder-open.png differ diff --git a/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/folder.png b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/folder.png new file mode 100644 index 0000000..65bd0bb Binary files /dev/null and b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/folder.png differ diff --git a/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/mail-forward.png b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/mail-forward.png new file mode 100644 index 0000000..de0199b Binary files /dev/null and b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/mail-forward.png differ diff --git a/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/media-playback-pause.png b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/media-playback-pause.png new file mode 100644 index 0000000..c8b4fe2 Binary files /dev/null and b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/media-playback-pause.png differ diff --git a/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/media-playback-start.png b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/media-playback-start.png new file mode 100644 index 0000000..a7de0fe Binary files /dev/null and b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/media-playback-start.png differ diff --git a/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/media-playback-stop.png b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/media-playback-stop.png new file mode 100644 index 0000000..ede2815 Binary files /dev/null and b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/media-playback-stop.png differ diff --git a/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/network-wired.png b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/network-wired.png new file mode 100644 index 0000000..3ac6b35 Binary files /dev/null and b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/network-wired.png differ diff --git a/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/network-wireless.png b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/network-wireless.png new file mode 100644 index 0000000..2dc6250 Binary files /dev/null and b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/network-wireless.png differ diff --git a/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/network-workgroup.png b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/network-workgroup.png new file mode 100644 index 0000000..5c140d8 Binary files /dev/null and b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/network-workgroup.png differ diff --git a/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/package-x-generic.png b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/package-x-generic.png new file mode 100644 index 0000000..9015426 Binary files /dev/null and b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/package-x-generic.png differ diff --git a/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/text-x-generic.png b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/text-x-generic.png new file mode 100644 index 0000000..2d7f2d6 Binary files /dev/null and b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/text-x-generic.png differ diff --git a/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/utilities-system-monitor.png b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/utilities-system-monitor.png new file mode 100644 index 0000000..8734e77 Binary files /dev/null and b/Kayak-ui/src/main/resources/com/github/kayak/ui/icons/utilities-system-monitor.png differ diff --git a/application/pom.xml b/application/pom.xml index ea06c8c..bf4e37e 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -18,7 +18,7 @@ org.netbeans.cluster platform - RELEASE80 + RELEASE82 pom @@ -54,7 +54,11 @@ org.codehaus.mojo nbm-maven-plugin - 3.13 + 3.13.3 + + false + license.txt + @@ -89,7 +93,7 @@ - 3.6 + 4.1 diff --git a/pom.xml b/pom.xml index 5fe6684..57b0fad 100644 --- a/pom.xml +++ b/pom.xml @@ -40,7 +40,7 @@ junit junit - 4.8.2 + 4.12 test @@ -57,14 +57,14 @@ kayak ${basedir}/kayak.conf - 3.13 + 3.13.3 org.apache.maven.plugins maven-compiler-plugin - 3.0 + 3.8.0 1.7 1.7 @@ -72,17 +72,17 @@ maven-site-plugin - 3.0 + 3.7.1 org.apache.maven.plugins maven-release-plugin - 2.0 + 2.5.3 org.apache.maven.plugins maven-jar-plugin - 2.3.2 + 2.6 true @@ -102,7 +102,7 @@ - RELEASE80 + RELEASE82 kayak UTF-8