This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 60ecbe2 [NETBEANS-2417] Gradle Logo Update (#1557)
60ecbe2 is described below
commit 60ecbe29abd96624d49a8f84d665cd0f5b977a11
Author: Laszlo Kishalmi <laszlo.kisha...@gmail.com>
AuthorDate: Sat Nov 30 11:44:26 2019 -0800
[NETBEANS-2417] Gradle Logo Update (#1557)
* [NETBEANS-2417] Update Gradle logo/icon
* [NETBEANS-2417] Add darker variants for light backgrounds
* [NETBEANS-2417] Update Gradle logo/icon (resize tweaks)
* [NETBEANS-2417] Update Gradle logo/icon (web project icons)
* [NETBEANS-2417] Changed Gradle Elephant task icon in navigator to Ant
target icon.
* [NETBEANS-2417] Cleaned up the Gradle icon handling
* [NETBEANS-2417] Move the aplication badge to the JavaSE support.
* [NETBEANS-2417] Added more license and notice information
* Removed the Gradle notice and added the exact information for the source
if the icons.
* Removed Apache 2.0 license from Gradle Artwork, put them to RAT exclusions
* Try to finalize the 'licensing' of the icons.
---
groovy/gradle.java/licenseinfo.xml | 12 ++++-
.../gradle/java/JavaSEProjectIconProvider.java} | 49 +++++++++------------
.../gradle/java}/resources/application-badge.png | Bin
.../gradle/java/resources/javaseProjectIcon.png | Bin 882 -> 491 bytes
.../java/resources/javaseProjectIcon_dark.png | Bin 910 -> 585 bytes
.../{gradle.java => gradle.javaee}/licenseinfo.xml | 13 ++++--
.../gradle/javaee/JavaEEProjectIconProvider.java} | 46 +++++++------------
.../gradle/javaee/resources/javaeeProjectIcon.png | Bin 0 -> 491 bytes
.../javaee/resources/javaeeProjectIcon_dark.png | Bin 0 -> 585 bytes
.../gradle/javaee/resources/webProjectIcon.png | Bin 867 -> 0 bytes
.../javaee/resources/webProjectIcon_dark.png | Bin 881 -> 0 bytes
.../newproject/WebApplicationProjectWizard.java | 2 +-
groovy/gradle/licenseinfo.xml | 46 +++++++++----------
.../gradle/execute/navigator/TasksPanel.java | 36 +++++----------
.../modules/gradle/nodes/SubProjectsNode.java | 5 +--
.../gradle/queries/DefaultProjectIconProvider.java | 22 +--------
.../org/netbeans/modules/gradle/queries/Info.java | 11 ++---
.../netbeans/modules/gradle/resources/cofee.png | Bin 613 -> 0 bytes
.../netbeans/modules/gradle/resources/globe.png | Bin 573 -> 0 bytes
.../modules/gradle/resources/gradle-badge.png | Bin 348 -> 248 bytes
.../modules/gradle/resources/gradle-badge_dark.png | Bin 0 -> 249 bytes
.../gradle/resources/gradle-large-badge.png | Bin 438 -> 402 bytes
.../gradle/resources/gradle-large-badge_dark.png | Bin 0 -> 456 bytes
.../modules/gradle/resources/gradle-task.gif | Bin 0 -> 450 bytes
.../modules/gradle/resources/gradle-task.png | Bin 838 -> 0 bytes
.../netbeans/modules/gradle/resources/gradle.png | Bin 3387 -> 491 bytes
.../modules/gradle/resources/gradle_dark.png | Bin 876 -> 585 bytes
.../modules/gradle/resources/javaseProjectIcon.png | Bin 882 -> 0 bytes
.../gradle/resources/javaseProjectIcon_dark.png | Bin 910 -> 0 bytes
.../modules/gradle/resources/webProjectIcon.png | Bin 867 -> 0 bytes
.../gradle/resources/webProjectIcon_dark.png | Bin 881 -> 0 bytes
nbbuild/licenses/Gradle-icon | 9 ++++
32 files changed, 108 insertions(+), 143 deletions(-)
diff --git a/groovy/gradle.java/licenseinfo.xml
b/groovy/gradle.java/licenseinfo.xml
index 7d410e6..a8f9d6e 100644
--- a/groovy/gradle.java/licenseinfo.xml
+++ b/groovy/gradle.java/licenseinfo.xml
@@ -21,10 +21,18 @@
-->
<licenseinfo>
<fileset>
-
<file>src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon.png</file>
-
<file>src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon_dark.png</file>
+
<file>src/org/netbeans/modules/gradle/java/resources/application-badge.png</file>
<file>src/org/netbeans/modules/gradle/java/resources/libraries-badge.png</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
+ <fileset>
+
<file>src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon.png</file>
+
<file>src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon_dark.png</file>
+ <license ref="Gradle-icon"/>
+ <comment type="COMMENT_UNSUPPORTED">
+ Icons are based based on artwork available on the
https://gradle.org/brand/ .
+ More specificly:
https://gradle.com/brand_assets/Gradle_Elephant_Icon_Assets.zip
+ </comment>
+ </fileset>
</licenseinfo>
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/queries/DefaultProjectIconProvider.java
b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaSEProjectIconProvider.java
similarity index 61%
copy from
groovy/gradle/src/org/netbeans/modules/gradle/queries/DefaultProjectIconProvider.java
copy to
groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaSEProjectIconProvider.java
index 57f3cf7..4a16ef6 100644
---
a/groovy/gradle/src/org/netbeans/modules/gradle/queries/DefaultProjectIconProvider.java
+++
b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/JavaSEProjectIconProvider.java
@@ -16,56 +16,52 @@
* specific language governing permissions and limitations
* under the License.
*/
+package org.netbeans.modules.gradle.java;
-package org.netbeans.modules.gradle.queries;
-
-import org.netbeans.modules.gradle.api.GradleBaseProject;
-import org.netbeans.modules.gradle.api.NbGradleProject;
-import org.netbeans.modules.gradle.spi.ProjectIconProvider;
import java.awt.Image;
import java.util.Set;
import org.netbeans.api.annotations.common.StaticResource;
import org.netbeans.api.project.Project;
+import org.netbeans.modules.gradle.api.GradleBaseProject;
+import org.netbeans.modules.gradle.api.NbGradleProject;
+import org.netbeans.modules.gradle.spi.ProjectIconProvider;
+import org.netbeans.spi.project.LookupProvider.Registration.ProjectType;
import org.netbeans.spi.project.ProjectServiceProvider;
import org.openide.util.ImageUtilities;
/**
*
- * @author Laszlo Kishalmi
+ * @author lkishalmi
*/
-@ProjectServiceProvider(service = ProjectIconProvider.class, projectType =
NbGradleProject.GRADLE_PROJECT_TYPE)
-public class DefaultProjectIconProvider implements ProjectIconProvider {
+@ProjectServiceProvider(service = ProjectIconProvider.class, projectTypes = {
+ @ProjectType(id = NbGradleProject.GRADLE_PROJECT_TYPE, position = 1000)
+})
+public class JavaSEProjectIconProvider implements ProjectIconProvider {
@StaticResource
- private static final String GRADLE_ICON =
"org/netbeans/modules/gradle/resources/gradle.png"; //NOI18
+ private static final String GRADLE_JAVASE_ICON =
"org/netbeans/modules/gradle/java/resources/javaseProjectIcon.png"; //NOI18
@StaticResource
- private static final String GRADLE_JAVASE_ICON =
"org/netbeans/modules/gradle/resources/javaseProjectIcon.png"; //NOI18
-
- @StaticResource
- private static final String GRADLE_WEB_ICON =
"org/netbeans/modules/gradle/resources/webProjectIcon.png"; //NOI18
-
- @StaticResource
- private static final String APPLICATION_BADGE =
"org/netbeans/modules/gradle/resources/application-badge.png"; //NOI18
+ private static final String APPLICATION_BADGE =
"org/netbeans/modules/gradle/java/resources/application-badge.png"; //NOI18
final Project project;
- public DefaultProjectIconProvider(Project project) {
+ public JavaSEProjectIconProvider(Project project) {
this.project = project;
}
-
+
@Override
public Image getIcon() {
+ Image ret = null;
Set<String> plugins = GradleBaseProject.get(project).getPlugins();
- String iconResource = plugins.contains("java") ? GRADLE_JAVASE_ICON:
GRADLE_ICON;
- iconResource = plugins.contains("war") ? GRADLE_WEB_ICON :
iconResource;
- Image ret = ImageUtilities.loadImage(iconResource);
-
- if (plugins.contains("application")) {
- Image badge = ImageUtilities.loadImage(APPLICATION_BADGE);
- ret = ImageUtilities.mergeImages(ret, badge, 8, 8);
+ if (plugins.contains("java")) { //NOI18N
+ ret = ImageUtilities.loadImage(GRADLE_JAVASE_ICON);
+ if (plugins.contains("application")) { //NOI18N
+ Image badge = ImageUtilities.loadImage(APPLICATION_BADGE);
+ ret = ImageUtilities.mergeImages(ret, badge, 8, 8);
+ }
}
- return ret;
+ return ret;
}
@Override
@@ -73,5 +69,4 @@ public class DefaultProjectIconProvider implements
ProjectIconProvider {
return false;
}
-
}
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/application-badge.png
b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/resources/application-badge.png
similarity index 100%
rename from
groovy/gradle/src/org/netbeans/modules/gradle/resources/application-badge.png
rename to
groovy/gradle.java/src/org/netbeans/modules/gradle/java/resources/application-badge.png
diff --git
a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon.png
b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon.png
index 165a430..33c2386 100644
Binary files
a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon.png
and
b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon.png
differ
diff --git
a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon_dark.png
b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon_dark.png
index 5053777..dd6cb8b 100644
Binary files
a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon_dark.png
and
b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon_dark.png
differ
diff --git a/groovy/gradle.java/licenseinfo.xml
b/groovy/gradle.javaee/licenseinfo.xml
similarity index 63%
copy from groovy/gradle.java/licenseinfo.xml
copy to groovy/gradle.javaee/licenseinfo.xml
index 7d410e6..1721645 100644
--- a/groovy/gradle.java/licenseinfo.xml
+++ b/groovy/gradle.javaee/licenseinfo.xml
@@ -21,10 +21,17 @@
-->
<licenseinfo>
<fileset>
-
<file>src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon.png</file>
-
<file>src/org/netbeans/modules/gradle/java/resources/javaseProjectIcon_dark.png</file>
-
<file>src/org/netbeans/modules/gradle/java/resources/libraries-badge.png</file>
+
<file>src/org/netbeans/modules/gradle/javaee/resources/WebPagesBadge.png</file>
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
+ <fileset>
+
<file>src/org/netbeans/modules/gradle/javaee/resources/javaeeProjectIcon.png</file>
+
<file>src/org/netbeans/modules/gradle/javaee/resources/javaeeProjectIcon_dark.png</file>
+ <license ref="Gradle-icon" />
+ <comment type="COMMENT_UNSUPPORTED">
+ Icons are based based on artwork available on the
https://gradle.org/brand/ .
+ More specificly:
https://gradle.com/brand_assets/Gradle_Elephant_Icon_Assets.zip
+ </comment>
+ </fileset>
</licenseinfo>
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/queries/DefaultProjectIconProvider.java
b/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/JavaEEProjectIconProvider.java
similarity index 56%
copy from
groovy/gradle/src/org/netbeans/modules/gradle/queries/DefaultProjectIconProvider.java
copy to
groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/JavaEEProjectIconProvider.java
index 57f3cf7..bd7a92c 100644
---
a/groovy/gradle/src/org/netbeans/modules/gradle/queries/DefaultProjectIconProvider.java
+++
b/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/JavaEEProjectIconProvider.java
@@ -16,56 +16,45 @@
* specific language governing permissions and limitations
* under the License.
*/
+package org.netbeans.modules.gradle.javaee;
-package org.netbeans.modules.gradle.queries;
-
-import org.netbeans.modules.gradle.api.GradleBaseProject;
-import org.netbeans.modules.gradle.api.NbGradleProject;
-import org.netbeans.modules.gradle.spi.ProjectIconProvider;
import java.awt.Image;
import java.util.Set;
import org.netbeans.api.annotations.common.StaticResource;
import org.netbeans.api.project.Project;
+import org.netbeans.modules.gradle.api.GradleBaseProject;
+import org.netbeans.modules.gradle.api.NbGradleProject;
+import org.netbeans.modules.gradle.spi.ProjectIconProvider;
+import org.netbeans.spi.project.LookupProvider.Registration.ProjectType;
import org.netbeans.spi.project.ProjectServiceProvider;
import org.openide.util.ImageUtilities;
/**
*
- * @author Laszlo Kishalmi
+ * @author lkishalmi
*/
-@ProjectServiceProvider(service = ProjectIconProvider.class, projectType =
NbGradleProject.GRADLE_PROJECT_TYPE)
-public class DefaultProjectIconProvider implements ProjectIconProvider {
+@ProjectServiceProvider(service = ProjectIconProvider.class, projectTypes = {
+ @ProjectType(id = NbGradleProject.GRADLE_PROJECT_TYPE, position = 900)
+})
+public final class JavaEEProjectIconProvider implements ProjectIconProvider {
@StaticResource
- private static final String GRADLE_ICON =
"org/netbeans/modules/gradle/resources/gradle.png"; //NOI18
-
- @StaticResource
- private static final String GRADLE_JAVASE_ICON =
"org/netbeans/modules/gradle/resources/javaseProjectIcon.png"; //NOI18
-
- @StaticResource
- private static final String GRADLE_WEB_ICON =
"org/netbeans/modules/gradle/resources/webProjectIcon.png"; //NOI18
-
- @StaticResource
- private static final String APPLICATION_BADGE =
"org/netbeans/modules/gradle/resources/application-badge.png"; //NOI18
+ private static final String GRADLE_JAVAEE_ICON =
"org/netbeans/modules/gradle/javaee/resources/javaeeProjectIcon.png"; //NOI18
final Project project;
- public DefaultProjectIconProvider(Project project) {
+ public JavaEEProjectIconProvider(Project project) {
this.project = project;
}
-
+
@Override
public Image getIcon() {
+ Image ret = null;
Set<String> plugins = GradleBaseProject.get(project).getPlugins();
- String iconResource = plugins.contains("java") ? GRADLE_JAVASE_ICON:
GRADLE_ICON;
- iconResource = plugins.contains("war") ? GRADLE_WEB_ICON :
iconResource;
- Image ret = ImageUtilities.loadImage(iconResource);
-
- if (plugins.contains("application")) {
- Image badge = ImageUtilities.loadImage(APPLICATION_BADGE);
- ret = ImageUtilities.mergeImages(ret, badge, 8, 8);
+ if (plugins.contains("war")) { //NOI18N
+ ret = ImageUtilities.loadImage(GRADLE_JAVAEE_ICON);
}
- return ret;
+ return ret;
}
@Override
@@ -73,5 +62,4 @@ public class DefaultProjectIconProvider implements
ProjectIconProvider {
return false;
}
-
}
diff --git
a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/javaeeProjectIcon.png
b/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/javaeeProjectIcon.png
new file mode 100644
index 0000000..33c2386
Binary files /dev/null and
b/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/javaeeProjectIcon.png
differ
diff --git
a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/javaeeProjectIcon_dark.png
b/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/javaeeProjectIcon_dark.png
new file mode 100644
index 0000000..dd6cb8b
Binary files /dev/null and
b/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/javaeeProjectIcon_dark.png
differ
diff --git
a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/webProjectIcon.png
b/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/webProjectIcon.png
deleted file mode 100644
index 3969cd2..0000000
Binary files
a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/webProjectIcon.png
and /dev/null differ
diff --git
a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/webProjectIcon_dark.png
b/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/webProjectIcon_dark.png
deleted file mode 100644
index 8f4dfdb..0000000
Binary files
a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/resources/webProjectIcon_dark.png
and /dev/null differ
diff --git
a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/WebApplicationProjectWizard.java
b/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/WebApplicationProjectWizard.java
index be86cd1..274e7c1 100644
---
a/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/WebApplicationProjectWizard.java
+++
b/groovy/gradle.javaee/src/org/netbeans/modules/gradle/javaee/web/newproject/WebApplicationProjectWizard.java
@@ -40,7 +40,7 @@ import org.openide.util.NbBundle.Messages;
*
* @author Laszlo Kishalmi
*/
-@TemplateRegistration(folder="Project/Gradle", position=200,
displayName="#template.webAppProject",
iconBase="org/netbeans/modules/gradle/javaee/resources/webProjectIcon.png",
description="WebApplicationDescription.html")
+@TemplateRegistration(folder="Project/Gradle", position=200,
displayName="#template.webAppProject",
iconBase="org/netbeans/modules/gradle/javaee/resources/javaeeProjectIcon.png",
description="WebApplicationDescription.html")
@Messages("template.webAppProject=Web Application")
public class WebApplicationProjectWizard extends SimpleGradleWizardIterator {
diff --git a/groovy/gradle/licenseinfo.xml b/groovy/gradle/licenseinfo.xml
index 49746ca..93818e5 100644
--- a/groovy/gradle/licenseinfo.xml
+++ b/groovy/gradle/licenseinfo.xml
@@ -21,35 +21,22 @@
-->
<licenseinfo>
<fileset>
-
<file>src/org/netbeans/modules/gradle/resources/gradle-large-badge.png</file>
- <file>src/org/netbeans/modules/gradle/resources/refresh.png</file>
-
<file>src/org/netbeans/modules/gradle/resources/warning-badge.png</file>
+
<file>src/org/netbeans/modules/gradle/resources/buildscripts-badge.png</file>
+
<file>src/org/netbeans/modules/gradle/resources/defaultFolder.gif</file>
+
<file>src/org/netbeans/modules/gradle/resources/defaultFolderOpen.gif</file>
<file>src/org/netbeans/modules/gradle/resources/empty.png</file>
-
<file>src/org/netbeans/modules/gradle/resources/module-artifact_dark.png</file>
- <file>src/org/netbeans/modules/gradle/resources/gradle-task.png</file>
- <file>src/org/netbeans/modules/gradle/resources/gradle-badge.png</file>
+
<file>src/org/netbeans/modules/gradle/resources/javadoc-badge.png</file>
<file>src/org/netbeans/modules/gradle/resources/libraries-badge.png</file>
- <file>src/org/netbeans/modules/gradle/resources/refreshdebug.png</file>
- <file>src/org/netbeans/modules/gradle/resources/restart.png</file>
-
<file>src/org/netbeans/modules/gradle/resources/javaseProjectIcon.png</file>
- <file>src/org/netbeans/modules/gradle/resources/stop.png</file>
-
<file>src/org/netbeans/modules/gradle/resources/webProjectIcon_dark.png</file>
-
<file>src/org/netbeans/modules/gradle/resources/webProjectIcon.png</file>
- <file>src/org/netbeans/modules/gradle/resources/gradle_dark.png</file>
-
<file>src/org/netbeans/modules/gradle/resources/buildscripts-badge.png</file>
+ <file>src/org/netbeans/modules/gradle/resources/libraries.png</file>
<file>src/org/netbeans/modules/gradle/resources/module-artifact.png</file>
+
<file>src/org/netbeans/modules/gradle/resources/module-artifact_dark.png</file>
<file>src/org/netbeans/modules/gradle/resources/options.png</file>
+ <file>src/org/netbeans/modules/gradle/resources/refresh.png</file>
+ <file>src/org/netbeans/modules/gradle/resources/refreshdebug.png</file>
+ <file>src/org/netbeans/modules/gradle/resources/restart.png</file>
<file>src/org/netbeans/modules/gradle/resources/sources-badge.png</file>
-
<file>src/org/netbeans/modules/gradle/resources/application-badge.png</file>
-
<file>src/org/netbeans/modules/gradle/resources/javaseProjectIcon_dark.png</file>
-
<file>src/org/netbeans/modules/gradle/resources/javadoc-badge.png</file>
- <file>src/org/netbeans/modules/gradle/resources/libraries.png</file>
- <file>src/org/netbeans/modules/gradle/resources/cofee.png</file>
- <file>src/org/netbeans/modules/gradle/resources/gradle.png</file>
- <file>src/org/netbeans/modules/gradle/resources/globe.png</file>
<file>src/org/netbeans/modules/gradle/resources/wait.gif</file>
-
<file>src/org/netbeans/modules/gradle/resources/defaultFolder.gif</file>
-
<file>src/org/netbeans/modules/gradle/resources/defaultFolderOpen.gif</file>
+
<file>src/org/netbeans/modules/gradle/resources/warning-badge.png</file>
<file>src/org/netbeans/modules/gradle/api/doc-files/gradle-classes.dia</file>
<file>src/org/netbeans/modules/gradle/api/doc-files/gradle-classes.png</file>
<file>src/org/netbeans/modules/gradle/api/doc-files/gradle-quality.dia</file>
@@ -57,4 +44,17 @@
<license ref="Apache-2.0-ASF" />
<comment type="COMMENT_UNSUPPORTED" />
</fileset>
+ <fileset>
+ <file>src/org/netbeans/modules/gradle/resources/gradle-badge.png</file>
+
<file>src/org/netbeans/modules/gradle/resources/gradle-badge_dark.png</file>
+
<file>src/org/netbeans/modules/gradle/resources/gradle-large-badge.png</file>
+
<file>src/org/netbeans/modules/gradle/resources/gradle-large-badge_dark.png</file>
+ <file>src/org/netbeans/modules/gradle/resources/gradle.png</file>
+ <file>src/org/netbeans/modules/gradle/resources/gradle_dark.png</file>
+ <license ref="Gradle-icon" />
+ <comment type="COMMENT_UNSUPPORTED">
+ Icons are based based on artwork available on the
https://gradle.org/brand/ .
+ More specificly:
https://gradle.com/brand_assets/Gradle_Elephant_Icon_Assets.zip
+ </comment>
+ </fileset>
</licenseinfo>
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksPanel.java
b/groovy/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksPanel.java
index c064c20..c9ee96a 100644
---
a/groovy/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksPanel.java
+++
b/groovy/gradle/src/org/netbeans/modules/gradle/execute/navigator/TasksPanel.java
@@ -145,12 +145,8 @@ public class TasksPanel extends javax.swing.JPanel
implements ExplorerManager.Pr
GradleBaseProject prj = GradleBaseProject.get(currentP);
if (prj != null) {
final Children ch = new Children.Array();
- ArrayList<String> glist = new ArrayList<>();
- for (String group : prj.getTaskGroups()) {
- if (!GradleBaseProject.PRIVATE_TASK_GROUP.equals(group)) {
- glist.add(group);
- }
- }
+ ArrayList<String> glist = new ArrayList<>(prj.getTaskGroups());
+ glist.remove(GradleBaseProject.PRIVATE_TASK_GROUP);
Collections.sort(glist, String.CASE_INSENSITIVE_ORDER);
for (String group : glist) {
@@ -179,12 +175,9 @@ public class TasksPanel extends javax.swing.JPanel
implements ExplorerManager.Pr
}
current = null;
currentP = null;
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- treeView.setRootVisible(false);
- manager.setRootContext(createEmptyNode());
- }
+ SwingUtilities.invokeLater(() -> {
+ treeView.setRootVisible(false);
+ manager.setRootContext(createEmptyNode());
});
}
@@ -192,12 +185,9 @@ public class TasksPanel extends javax.swing.JPanel
implements ExplorerManager.Pr
*
*/
public void showWaitNode() {
- SwingUtilities.invokeLater(new Runnable() {
- @Override
- public void run() {
- treeView.setRootVisible(true);
- manager.setRootContext(createWaitNode());
- }
+ SwingUtilities.invokeLater(() -> {
+ treeView.setRootVisible(true);
+ manager.setRootContext(createWaitNode());
});
}
@@ -213,7 +203,7 @@ public class TasksPanel extends javax.swing.JPanel
implements ExplorerManager.Pr
private static final String WAIT_GIF =
"org/netbeans/modules/gradle/resources/wait.gif";
@StaticResource
- private static final String TASK_ICON =
"org/netbeans/modules/gradle/resources/gradle-task.png";
+ private static final String TASK_ICON =
"org/netbeans/modules/gradle/resources/gradle-task.gif";
private static Node createEmptyNode() {
return new AbstractNode(Children.LEAF);
@@ -307,13 +297,7 @@ public class TasksPanel extends javax.swing.JPanel
implements ExplorerManager.Pr
@Override
protected boolean createKeys(List<GradleTask> list) {
ArrayList<GradleTask> ret = new
ArrayList<>(project.getTasks(group));
- Collections.sort(ret, new Comparator<GradleTask>() {
-
- @Override
- public int compare(GradleTask o1, GradleTask o2) {
- return o1.getName().compareToIgnoreCase(o2.getName());
- }
- });
+ Collections.sort(ret, Comparator.comparing(GradleTask::getName,
String.CASE_INSENSITIVE_ORDER));
list.addAll(ret);
return true;
}
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/nodes/SubProjectsNode.java
b/groovy/gradle/src/org/netbeans/modules/gradle/nodes/SubProjectsNode.java
index 0114cb0..721cf95 100644
--- a/groovy/gradle/src/org/netbeans/modules/gradle/nodes/SubProjectsNode.java
+++ b/groovy/gradle/src/org/netbeans/modules/gradle/nodes/SubProjectsNode.java
@@ -58,7 +58,6 @@ import java.util.Set;
import java.util.TreeSet;
import org.netbeans.modules.gradle.spi.Utils;
import org.openide.ErrorManager;
-import org.openide.nodes.Children;
/**
*
@@ -68,7 +67,7 @@ public class SubProjectsNode extends AbstractNode {
@StaticResource
private static final String SP_BADGE
- = "org/netbeans/modules/gradle/resources/gradle-badge.png";
+ = "org/netbeans/modules/gradle/resources/gradle-large-badge.png";
@NbBundle.Messages("LBL_SubProjects=Sub Projects")
public SubProjectsNode(NbGradleProjectImpl proj, String path) {
@@ -95,7 +94,7 @@ public class SubProjectsNode extends AbstractNode {
private static Image getIcon(boolean opened) {
Image badge = ImageUtilities.loadImage(SP_BADGE, true); //NOI18N
- return ImageUtilities.mergeImages(NodeUtils.getTreeFolderIcon(opened),
badge, 8, 8);
+ return ImageUtilities.mergeImages(NodeUtils.getTreeFolderIcon(opened),
badge, 4, 4);
}
@Override
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/queries/DefaultProjectIconProvider.java
b/groovy/gradle/src/org/netbeans/modules/gradle/queries/DefaultProjectIconProvider.java
index 57f3cf7..bbafae7 100644
---
a/groovy/gradle/src/org/netbeans/modules/gradle/queries/DefaultProjectIconProvider.java
+++
b/groovy/gradle/src/org/netbeans/modules/gradle/queries/DefaultProjectIconProvider.java
@@ -19,11 +19,9 @@
package org.netbeans.modules.gradle.queries;
-import org.netbeans.modules.gradle.api.GradleBaseProject;
import org.netbeans.modules.gradle.api.NbGradleProject;
import org.netbeans.modules.gradle.spi.ProjectIconProvider;
import java.awt.Image;
-import java.util.Set;
import org.netbeans.api.annotations.common.StaticResource;
import org.netbeans.api.project.Project;
import org.netbeans.spi.project.ProjectServiceProvider;
@@ -39,15 +37,6 @@ public class DefaultProjectIconProvider implements
ProjectIconProvider {
@StaticResource
private static final String GRADLE_ICON =
"org/netbeans/modules/gradle/resources/gradle.png"; //NOI18
- @StaticResource
- private static final String GRADLE_JAVASE_ICON =
"org/netbeans/modules/gradle/resources/javaseProjectIcon.png"; //NOI18
-
- @StaticResource
- private static final String GRADLE_WEB_ICON =
"org/netbeans/modules/gradle/resources/webProjectIcon.png"; //NOI18
-
- @StaticResource
- private static final String APPLICATION_BADGE =
"org/netbeans/modules/gradle/resources/application-badge.png"; //NOI18
-
final Project project;
public DefaultProjectIconProvider(Project project) {
@@ -56,16 +45,7 @@ public class DefaultProjectIconProvider implements
ProjectIconProvider {
@Override
public Image getIcon() {
- Set<String> plugins = GradleBaseProject.get(project).getPlugins();
- String iconResource = plugins.contains("java") ? GRADLE_JAVASE_ICON:
GRADLE_ICON;
- iconResource = plugins.contains("war") ? GRADLE_WEB_ICON :
iconResource;
- Image ret = ImageUtilities.loadImage(iconResource);
-
- if (plugins.contains("application")) {
- Image badge = ImageUtilities.loadImage(APPLICATION_BADGE);
- ret = ImageUtilities.mergeImages(ret, badge, 8, 8);
- }
- return ret;
+ return ImageUtilities.loadImage(GRADLE_ICON);
}
@Override
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/queries/Info.java
b/groovy/gradle/src/org/netbeans/modules/gradle/queries/Info.java
index b9cfe26..11c3b7e 100644
--- a/groovy/gradle/src/org/netbeans/modules/gradle/queries/Info.java
+++ b/groovy/gradle/src/org/netbeans/modules/gradle/queries/Info.java
@@ -39,7 +39,6 @@ import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectInformation;
import org.netbeans.spi.project.ProjectServiceProvider;
import org.openide.util.ImageUtilities;
-import org.openide.util.RequestProcessor;
import org.openide.util.WeakListeners;
/**
@@ -52,15 +51,11 @@ public final class Info implements ProjectInformation,
PropertyChangeListener {
@StaticResource
private static final String GRADLE_BADGE =
"org/netbeans/modules/gradle/resources/gradle-large-badge.png"; //NOI18
- private static final RequestProcessor RP = new
RequestProcessor(Info.class.getName(), 10);
private final Project project;
private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
- private final PreferenceChangeListener preferenceChangeListener = new
PreferenceChangeListener() {
- @Override
- public void preferenceChange(PreferenceChangeEvent evt) {
- if (GradleSettings.PROP_DISPLAY_DESCRIPTION.equals(evt.getKey())) {
- pcs.firePropertyChange(ProjectInformation.PROP_DISPLAY_NAME,
null, null);
- }
+ private final PreferenceChangeListener preferenceChangeListener =
(PreferenceChangeEvent evt) -> {
+ if (GradleSettings.PROP_DISPLAY_DESCRIPTION.equals(evt.getKey())) {
+ pcs.firePropertyChange(ProjectInformation.PROP_DISPLAY_NAME, null,
null);
}
};
private final AtomicBoolean prefChangeListenerSet = new
AtomicBoolean(false);
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/cofee.png
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/cofee.png
deleted file mode 100644
index be8eb14..0000000
Binary files
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/cofee.png and
/dev/null differ
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/globe.png
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/globe.png
deleted file mode 100644
index 8ea5f31..0000000
Binary files
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/globe.png and
/dev/null differ
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-badge.png
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-badge.png
index 556ca73..bb59559 100644
Binary files
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-badge.png and
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-badge.png
differ
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-badge_dark.png
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-badge_dark.png
new file mode 100644
index 0000000..436b078
Binary files /dev/null and
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-badge_dark.png
differ
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-large-badge.png
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-large-badge.png
index 27179e5..c9fdab3 100644
Binary files
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-large-badge.png
and
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-large-badge.png
differ
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-large-badge_dark.png
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-large-badge_dark.png
new file mode 100644
index 0000000..6ed9f5f
Binary files /dev/null and
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-large-badge_dark.png
differ
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-task.gif
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-task.gif
new file mode 100644
index 0000000..af6ec5e
Binary files /dev/null and
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-task.gif differ
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-task.png
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-task.png
deleted file mode 100644
index 01af02f..0000000
Binary files
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle-task.png and
/dev/null differ
diff --git a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle.png
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle.png
index 91c0991..33c2386 100644
Binary files
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle.png and
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle.png differ
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle_dark.png
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle_dark.png
index 0ce50f5..dd6cb8b 100644
Binary files
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle_dark.png and
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/gradle_dark.png differ
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/javaseProjectIcon.png
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/javaseProjectIcon.png
deleted file mode 100644
index 165a430..0000000
Binary files
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/javaseProjectIcon.png
and /dev/null differ
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/javaseProjectIcon_dark.png
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/javaseProjectIcon_dark.png
deleted file mode 100644
index 5053777..0000000
Binary files
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/javaseProjectIcon_dark.png
and /dev/null differ
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/webProjectIcon.png
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/webProjectIcon.png
deleted file mode 100644
index 3969cd2..0000000
Binary files
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/webProjectIcon.png
and /dev/null differ
diff --git
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/webProjectIcon_dark.png
b/groovy/gradle/src/org/netbeans/modules/gradle/resources/webProjectIcon_dark.png
deleted file mode 100644
index 8f4dfdb..0000000
Binary files
a/groovy/gradle/src/org/netbeans/modules/gradle/resources/webProjectIcon_dark.png
and /dev/null differ
diff --git a/nbbuild/licenses/Gradle-icon b/nbbuild/licenses/Gradle-icon
new file mode 100644
index 0000000..ae6e2f5
--- /dev/null
+++ b/nbbuild/licenses/Gradle-icon
@@ -0,0 +1,9 @@
+Gradle embraces “fair use” of its trademarks. As such, you may use the
+foregoing trademarks to identify Gradle and its family of products, for
example,
+in your website, blog, news article, or product review, without our written
+consent, as long as you use them without modification or deceptive intent and
do
+not cause a likelihood of confusion between yourself and Gradle’s brands.
+
+See:
+ - https://gradle.com/brand/
+ - https://issues.apache.org/jira/browse/LEGAL-495
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
