Skip to content
This repository has been archived by the owner on Dec 24, 2020. It is now read-only.

Commit

Permalink
Updated Netbeans platform dependencies to compile again. Also, icons …
Browse files Browse the repository at this point in the history 
…are now embedded.
  • Loading branch information
@dschanoeh
dschanoeh committed Nov 10, 2018
1 parent f6949c9 commit 4a82757
Show file tree
Hide file tree
Showing 85 changed files with 153 additions and 139 deletions.
6 changes: 3 additions & 3 deletions Kayak-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@
<publicPackage>com.github.kayak.core.description</publicPackage>
</publicPackages>
</configuration>
<version>3.13</version>
<version>3.13.3</version>
</plugin>

<plugin>
<!-- netbeans modules in 6.9+ are 1.6 compatible -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<version>3.8.0</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
Expand All @@ -56,7 +56,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.2</version>
<version>2.6</version>
<configuration>
<!-- to have the jar plugin pickup the nbm generated manifest -->
<useDefaultManifestFile>true</useDefaultManifestFile>
Expand Down
26 changes: 18 additions & 8 deletions Kayak-kcd/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,29 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.1</version>
<version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-lookup</artifactId>
<version>RELEASE80</version>
<version>RELEASE82</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0.1</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2.2</version>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand All @@ -71,11 +81,11 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<version>3.13</version>
<version>3.13.3</version>
<extensions>true</extensions>
<configuration>
<publicPackages>
<publicPackage>com.github.kayak.canio.kcd</publicPackage>
<publicPackage>com.github.kayak.canio</publicPackage>
<publicPackage>com.github.kayak.canio.kcd.loader</publicPackage>
</publicPackages>
</configuration>
Expand All @@ -84,7 +94,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<version>3.8.0</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
Expand All @@ -94,7 +104,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.2</version>
<version>2.6</version>
<configuration>
<!-- to have the jar plugin pickup the nbm generated manifest -->
<useDefaultManifestFile>true</useDefaultManifestFile>
Expand All @@ -105,7 +115,7 @@
<!-- Usage: mvn org.jvnet.jaxb2.maven2:maven-jaxb2-plugin:generate -->
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.8.0</version>
<version>0.14.0</version>
<configuration>
<schemaDirectory>src/main/resources/com/github/kayak/canio/kcd/loader</schemaDirectory>
<schemaIncludes>
Expand Down
45 changes: 25 additions & 20 deletions Kayak-logging/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util</artifactId>
<version>RELEASE80</version>
<version>RELEASE82</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand All @@ -45,37 +45,37 @@
<artifactId>org-openide-util-lookup</artifactId>
<groupId>org.netbeans.api</groupId>
<type>jar</type>
<version>RELEASE71</version>
<version>RELEASE82</version>
</dependency>
<dependency>
<artifactId>org-openide-windows</artifactId>
<groupId>org.netbeans.api</groupId>
<type>jar</type>
<version>RELEASE80</version>
<version>RELEASE82</version>
</dependency>
<dependency>
<artifactId>org-openide-awt</artifactId>
<groupId>org.netbeans.api</groupId>
<type>jar</type>
<version>RELEASE80</version>
<version>RELEASE82</version>
</dependency>
<dependency>
<artifactId>org-openide-nodes</artifactId>
<groupId>org.netbeans.api</groupId>
<type>jar</type>
<version>RELEASE80</version>
<version>RELEASE82</version>
</dependency>
<dependency>
<artifactId>org-openide-explorer</artifactId>
<groupId>org.netbeans.api</groupId>
<type>jar</type>
<version>RELEASE80</version>
<version>RELEASE82</version>
</dependency>
<dependency>
<artifactId>org-openide-filesystems</artifactId>
<groupId>org.netbeans.api</groupId>
<type>jar</type>
<version>RELEASE80</version>
<version>RELEASE82</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Expand All @@ -85,34 +85,39 @@
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-settings</artifactId>
<version>RELEASE80</version>
<version>RELEASE82</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-modules-options-api</artifactId>
<version>RELEASE80</version>
<version>RELEASE82</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-loaders</artifactId>
<version>RELEASE80</version>
<version>RELEASE82</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-openide-util-ui</artifactId>
<version>RELEASE82</version>
</dependency>
<dependency>
<groupId>org.netbeans.api</groupId>
<artifactId>org-netbeans-api-progress-nb</artifactId>
<version>RELEASE82</version>
</dependency>
<dependency>
<artifactId>org-netbeans-api-progress</artifactId>
<groupId>org.netbeans.api</groupId>
<type>jar</type>
<version>RELEASE80</version>
<version>RELEASE82</version>
</dependency>
<dependency>
<artifactId>org-openide-modules</artifactId>
<groupId>org.netbeans.api</groupId>
<type>jar</type>
<version>RELEASE80</version>
</dependency>
<dependency>
<groupId>org.tango-project</groupId>
<artifactId>tango-icon-theme</artifactId>
<version>0.8.0</version>
<version>RELEASE82</version>
</dependency>
</dependencies>

Expand All @@ -121,15 +126,15 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>nbm-maven-plugin</artifactId>
<version>3.13</version>
<version>3.13.3</version>
<extensions>true</extensions>
</plugin>

<plugin>
<!-- netbeans modules in 6.9+ are 1.6 compatible -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.0</version>
<version>3.8.0</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
Expand All @@ -139,7 +144,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.2</version>
<version>2.6</version>
<configuration>
<!-- to have the jar plugin pickup the nbm generated manifest -->
<useDefaultManifestFile>true</useDefaultManifestFile>
Expand Down
2 changes: 1 addition & 1 deletion Kayak-logging/src/main/java/com/github/kayak/logging/BookmarkLogFileAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
*
* @author Jan-Niklas Meier <dschanoeh@googlemail.com>
*/
@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)})
Expand Down
2 changes: 1 addition & 1 deletion Kayak-logging/src/main/java/com/github/kayak/logging/CompressLogFileAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
*
* @author Jan-Niklas Meier <dschanoeh@googlemail.com>
*/
@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)})
Expand Down
2 changes: 1 addition & 1 deletion Kayak-logging/src/main/java/com/github/kayak/logging/DeleteLogFileAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*
* @author Jan-Niklas Meier <dschanoeh@googlemail.com>
*/
@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)})
Expand Down
2 changes: 1 addition & 1 deletion Kayak-logging/src/main/java/com/github/kayak/logging/LogDirectoryFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ protected boolean createKeys(List<String> 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};
Expand Down
2 changes: 1 addition & 1 deletion Kayak-logging/src/main/java/com/github/kayak/logging/LogFileNode.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Kayak-logging/src/main/java/com/github/kayak/logging/LogFilesNodeFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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};
}

Expand Down
2 changes: 1 addition & 1 deletion Kayak-logging/src/main/java/com/github/kayak/logging/LogFilesTopComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion Kayak-logging/src/main/java/com/github/kayak/logging/OpenLogFileAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
* @author Jan-Niklas Meier <dschanoeh@googlemail.com>
*/
@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)})
Expand Down
2 changes: 1 addition & 1 deletion Kayak-logging/src/main/java/com/github/kayak/logging/input/LogInputTopComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion Kayak-logging/src/main/java/com/github/kayak/logging/output/LogOutputTopComponent.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion Kayak-logging/src/main/java/com/github/kayak/logging/snapshots/CreateSnapshotAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
*
* @author Jan-Niklas Meier <dschanoeh@googlemail.com>
*/
@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),
Expand Down
Binary file added ...g/src/main/resources/com/github/kayak/logging/icons/accessories-text-editor.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Kayak-logging/src/main/resources/com/github/kayak/logging/icons/bookmark-new.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Kayak-logging/src/main/resources/com/github/kayak/logging/icons/camera-photo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Kayak-logging/src/main/resources/com/github/kayak/logging/icons/document-open.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Kayak-logging/src/main/resources/com/github/kayak/logging/icons/edit-delete.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Kayak-logging/src/main/resources/com/github/kayak/logging/icons/folder.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Kayak-logging/src/main/resources/com/github/kayak/logging/icons/go-previous.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added ...logging/src/main/resources/com/github/kayak/logging/icons/package-x-generic.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4a82757

Please sign in to comment.