[518393] Add project explorer icons for Java EE 8
Since Java EE 8 introduced new version numbers, new icons need to be
added to org.eclipse.jst.jee.ui for AppClient 8.0, EAR 8.0 and Web App
4.0.
Signed-off-by: John Collier <John.J.Collier@ibm.com>
diff --git a/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF
index 0c3ddc8..af8513a 100644
--- a/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.jee.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.jst.jee.ui;singleton:=true
-Bundle-Version: 1.0.900.qualifier
+Bundle-Version: 1.0.910.qualifier
Bundle-Activator: org.eclipse.jst.jee.ui.plugin.JEEUIPlugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/appclient_80.gif b/plugins/org.eclipse.jst.jee.ui/icons/appclient_80.gif
new file mode 100644
index 0000000..4b49549
--- /dev/null
+++ b/plugins/org.eclipse.jst.jee.ui/icons/appclient_80.gif
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/ear_80.gif b/plugins/org.eclipse.jst.jee.ui/icons/ear_80.gif
new file mode 100644
index 0000000..5036498
--- /dev/null
+++ b/plugins/org.eclipse.jst.jee.ui/icons/ear_80.gif
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/icons/webapp_40.gif b/plugins/org.eclipse.jst.jee.ui/icons/webapp_40.gif
new file mode 100644
index 0000000..79c4339
--- /dev/null
+++ b/plugins/org.eclipse.jst.jee.ui/icons/webapp_40.gif
Binary files differ
diff --git a/plugins/org.eclipse.jst.jee.ui/pom.xml b/plugins/org.eclipse.jst.jee.ui/pom.xml
index 71e49ba..07e7cab 100644
--- a/plugins/org.eclipse.jst.jee.ui/pom.xml
+++ b/plugins/org.eclipse.jst.jee.ui/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.javaee</groupId>
<artifactId>org.eclipse.jst.jee.ui</artifactId>
- <version>1.0.900-SNAPSHOT</version>
+ <version>1.0.910-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java
index 47a21b8..c9f6565 100644
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java
+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/appclient/GroupAppClientProvider.java
@@ -1,5 +1,5 @@
/***********************************************************************
- * Copyright (c) 2008, 2013 by SAP AG, Walldorf.
+ * Copyright (c) 2008, 2017 by SAP AG, Walldorf.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,7 +7,7 @@
*
* Contributors:
* SAP AG - initial API and implementation
- * IBM - Java EE 7 support
+ * IBM - Java EE 7 and 8 support
***********************************************************************/
package org.eclipse.jst.jee.ui.internal.navigator.appclient;
@@ -49,7 +49,8 @@
private Image appClient50Image;
private Image appClient60Image;
private Image appClient70Image;
-
+ private Image appClient80Image;
+
private IFile ddFile;
@Override
@@ -89,6 +90,8 @@
return getAppClient60Image();
} else if (J2EEVersionConstants.VERSION_7_TEXT.equals(version)) {
return getAppClient70Image();
+ } else if (J2EEVersionConstants.VERSION_8_TEXT.equals(version)) {
+ return getAppClient80Image();
}
return getAppClient50Image();
}
@@ -133,4 +136,11 @@
}
return appClient70Image;
}
+
+ private Image getAppClient80Image() {
+ if (appClient80Image == null) {
+ appClient80Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.APP_CLIENT80).createImage();
+ }
+ return appClient80Image;
+ }
}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java
index f00c1ee..5ff2935 100644
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java
+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/ear/GroupEARProvider.java
@@ -1,5 +1,5 @@
/***********************************************************************
- * Copyright (c) 2008, 2013 by SAP AG, Walldorf.
+ * Copyright (c) 2008, 2017 by SAP AG, Walldorf.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,7 +7,7 @@
*
* Contributors:
* SAP AG - initial API and implementation
- * IBM - Java EE 7 support
+ * IBM - Java EE 7 and 8 support
***********************************************************************/
package org.eclipse.jst.jee.ui.internal.navigator.ear;
@@ -47,6 +47,7 @@
private static Image ear50Image;
private static Image ear60Image;
private static Image ear70Image;
+ private static Image ear80Image;
private EARVirtualComponent earComponent;
private IFile ddFile;
@@ -117,6 +118,8 @@
return getEar60Image();
} else if (J2EEVersionConstants.VERSION_7_TEXT.equals(version)) {
return getEar70Image();
+ } else if (J2EEVersionConstants.VERSION_8_TEXT.equals(version)) {
+ return getEar80Image();
}
return getEar50Image();
}
@@ -157,4 +160,11 @@
}
return ear70Image;
}
+
+ private Image getEar80Image() {
+ if (ear80Image == null) {
+ ear80Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.EAR8_IMAGE).createImage();
+ }
+ return ear80Image;
+ }
}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java
index ac70140..fa79fa7 100644
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java
+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/navigator/web/WebAppProvider.java
@@ -1,5 +1,5 @@
/***********************************************************************
- * Copyright (c) 2008, 2013 by SAP AG, Walldorf.
+ * Copyright (c) 2008, 2017 by SAP AG, Walldorf.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,7 +7,7 @@
*
* Contributors:
* SAP AG - initial API and implementation
- * IBM - Java EE 7 support
+ * IBM - Java EE 7 and 8 support
***********************************************************************/
package org.eclipse.jst.jee.ui.internal.navigator.web;
@@ -56,6 +56,7 @@
private Image web25Image;
private Image web30Image;
private Image web31Image;
+ private Image web40Image;
private IProject prjct = null;
private IFile ddFile = null;
@@ -106,6 +107,8 @@
return getWeb30Image();
} else if (J2EEVersionConstants.VERSION_3_1_TEXT.equals(version)) {
return getWeb31Image();
+ } else if (J2EEVersionConstants.VERSION_4_0_TEXT.equals(version)) {
+ return getWeb40Image();
}
return getWeb25Image();
}
@@ -158,4 +161,11 @@
}
return web31Image;
}
+
+ private Image getWeb40Image() {
+ if (web40Image == null) {
+ web40Image = JEEUIPlugin.getDefault().getImageDescriptor(JEEUIPluginIcons.IMG_WEBEE8MODEL).createImage();
+ }
+ return web40Image;
+ }
}
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPluginIcons.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPluginIcons.java
index d4d23a1..94e7f07 100644
--- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPluginIcons.java
+++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/plugin/JEEUIPluginIcons.java
@@ -19,6 +19,7 @@
public static String IMG_WEBEEMODEL = "webapp_25"; //$NON-NLS-1$
public static String IMG_WEBEE6MODEL = "webapp_30"; //$NON-NLS-1$
public static String IMG_WEBEE7MODEL = "webapp_31"; //$NON-NLS-1$
+ public static String IMG_WEBEE8MODEL = "webapp_40"; //$NON-NLS-1$
public static String IMG_CONNECTOR = "connection"; //$NON-NLS-1$
public static String IMG_EE7CONNECTOR = "connector_17"; //$NON-NLS-1$
public static String IMG_CONFIG_PROP = "config_prop_obj"; //$NON-NLS-1$
@@ -45,8 +46,10 @@
public static String EAR_IMAGE = "ear_50"; //$NON-NLS-1$
public static String EAR6_IMAGE = "ear_60"; //$NON-NLS-1$
public static String EAR7_IMAGE = "ear_70"; //$NON-NLS-1$
+ public static String EAR8_IMAGE = "ear_80"; //$NON-NLS-1$
public static String APP_CLIENT50 = "appclient_50"; //$NON-NLS-1$
public static String APP_CLIENT60 = "appclient_60"; //$NON-NLS-1$
public static String APP_CLIENT70 = "appclient_70"; //$NON-NLS-1$
+ public static String APP_CLIENT80 = "appclient_80"; //$NON-NLS-1$
}
\ No newline at end of file
