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
@@ -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
@@ -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
@@ -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
@@ -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 @@
-
+
@@ -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
@@ -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