JBoss Tools SVN: r17029 - trunk/vpe/plugins/org.jboss.tools.vpe/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-08-07 20:29:44 -0400 (Fri, 07 Aug 2009)
New Revision: 17029
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF
Log:
Unnecessary dependencies were removed from org.jboss.vpe plug-in
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2009-08-07 22:51:31 UTC (rev 17028)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/META-INF/MANIFEST.MF 2009-08-08 00:29:44 UTC (rev 17029)
@@ -39,31 +39,12 @@
org.jboss.tools.vpe.messages,
org.jboss.tools.vpe.resref,
org.jboss.tools.vpe.selbar
-Require-Bundle: org.jboss.tools.common.model.ui,
- org.eclipse.jface.text,
- org.eclipse.jdt.core,
- org.jboss.tools.common,
- org.jboss.tools.common.model,
+Require-Bundle: org.eclipse.jface.text,
org.jboss.tools.jst.jsp,
org.jboss.tools.jst.web,
- org.eclipse.wst.sse.core,
- org.eclipse.jst.jsp.ui,
- org.eclipse.wst.sse.ui,
- org.eclipse.wst.xml.core,
org.eclipse.wst.xml.ui,
- org.eclipse.wst.html.core,
- org.eclipse.wst.common.modulecore,
org.eclipse.compare,
org.eclipse.wst.common.ui,
- org.eclipse.jst.jsp.core,
- org.eclipse.wst.common.snippets,
- org.eclipse.wst.html.ui,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.swt,
- org.eclipse.jface,
org.eclipse.ui,
org.eclipse.ui.workbench.texteditor,
org.eclipse.ui.views,
@@ -76,7 +57,10 @@
org.jboss.tools.common.el.core,
org.jboss.tools.common.el.ui,
org.jboss.tools.jst.web.kb,
+ org.eclipse.jdt.ui,
+ org.eclipse.wst.sse.ui;bundle-version="1.1.100",
+ org.eclipse.wst.sse.core;bundle-version="1.1.400",
org.eclipse.core.expressions;bundle-version="3.4.100",
- org.eclipse.jdt.ui
+ org.jboss.tools.common.model.ui;bundle-version="2.0.0"
Bundle-Version: 2.1.0
Bundle-RequiredExecutionEnvironment: J2SE-1.5
16 years, 4 months
JBoss Tools SVN: r17028 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-08-07 18:51:31 -0400 (Fri, 07 Aug 2009)
New Revision: 17028
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java
Log:
JBIDE-4307
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java 2009-08-07 22:44:00 UTC (rev 17027)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/dialogs/XPathDialogs.java 2009-08-07 22:51:31 UTC (rev 17028)
@@ -823,7 +823,8 @@
if( element instanceof XPathFileResult ) {
XPathFileResult result = (XPathFileResult)element;
if( columnIndex == 0 ) {
- return result.getFileLocation().substring(result.getQuery().getBaseDir().length());
+ String substr = result.getFileLocation().substring(result.getQuery().getBaseDir().length());
+ return new Path(substr).makeRelative().toString();
}
if( result.getChildren().length == 1 ) {
element = result.getChildren()[0];
16 years, 4 months
JBoss Tools SVN: r17027 - branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-08-07 18:44:00 -0400 (Fri, 07 Aug 2009)
New Revision: 17027
Removed:
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo32.gif
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo40.gif
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo42.gif
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo50.gif
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo51.gif
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP.gif
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP43.gif
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP50.gif
Log:
deleting old logos JBIDE-4709
Deleted: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo32.gif
===================================================================
(Binary files differ)
Deleted: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo40.gif
===================================================================
(Binary files differ)
Deleted: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo42.gif
===================================================================
(Binary files differ)
Deleted: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo50.gif
===================================================================
(Binary files differ)
Deleted: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo51.gif
===================================================================
(Binary files differ)
Deleted: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP.gif
===================================================================
(Binary files differ)
Deleted: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP43.gif
===================================================================
(Binary files differ)
Deleted: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP50.gif
===================================================================
(Binary files differ)
16 years, 4 months
JBoss Tools SVN: r17026 - in branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-08-07 18:42:48 -0400 (Fri, 07 Aug 2009)
New Revision: 17026
Added:
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/JBoss_byRH_logo_rgb.png
Modified:
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java
Log:
JBIDE-4709 - icons in branch
Added: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/JBoss_byRH_logo_rgb.png
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/JBoss_byRH_logo_rgb.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java
===================================================================
--- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2009-08-07 22:36:26 UTC (rev 17025)
+++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2009-08-07 22:42:48 UTC (rev 17026)
@@ -39,14 +39,7 @@
public static final String IMG_JBOSS = "jboss";
public static final String IMG_JBOSS_CONFIGURATION = "jbossconfiguration";
- public static final String WIZBAN_JBOSS32_LOGO = "jboss3.2logo";
- public static final String WIZBAN_JBOSS40_LOGO = "jboss4.0logo";
- public static final String WIZBAN_JBOSS42_LOGO = "jboss4.2logo";
- public static final String WIZBAN_JBOSS50_LOGO = "jboss5.0logo";
- public static final String WIZBAN_JBOSS51_LOGO = "jboss5.1logo"; //$NON-NLS-1$
- public static final String WIZBAN_JBOSS_EAP_LOGO_43 = "jbossEAPlogo43";
- public static final String WIZBAN_JBOSS_EAP_LOGO_50 = "jbossEAPlogo50";
- public static final String WIZBAN_DEPLOY_ONLY_LOGO = "jbossdeployerlogo";
+ public static final String WIZBAN_JBOSS_LOGO = "jbossLogo"; //$NON-NLS-1$
public static final String TWIDDLE_IMAGE = "TWIDDLE_IMAGE";
public static final String INACTIVE_CATEGORY_IMAGE = "INACTIVE_CATEGORY_IMAGE";
public static final String GENERIC_SERVER_IMAGE = "GENERIC_SERVER_IMAGE";
@@ -73,14 +66,7 @@
descriptors.put(IMG_JBOSS, createImageDescriptor(pluginBundle, "/icons/jboss.gif"));
descriptors.put(IMG_JBOSS_CONFIGURATION, createImageDescriptor(pluginBundle, "/icons/jboss-configuration.gif"));
- descriptors.put(WIZBAN_JBOSS32_LOGO, createImageDescriptor(pluginBundle, "/icons/logo32.gif"));
- descriptors.put(WIZBAN_JBOSS40_LOGO, createImageDescriptor(pluginBundle, "/icons/logo40.gif"));
- descriptors.put(WIZBAN_JBOSS42_LOGO, createImageDescriptor(pluginBundle, "/icons/logo42.gif"));
- descriptors.put(WIZBAN_JBOSS50_LOGO, createImageDescriptor(pluginBundle, "/icons/logo50.gif"));
- descriptors.put(WIZBAN_JBOSS51_LOGO, createImageDescriptor(pluginBundle, "/icons/logo51.gif"));
- descriptors.put(WIZBAN_JBOSS_EAP_LOGO_43, createImageDescriptor(pluginBundle, "/icons/logoEAP43.gif"));
- descriptors.put(WIZBAN_JBOSS_EAP_LOGO_50, createImageDescriptor(pluginBundle, "/icons/logoEAP50.gif"));
- descriptors.put(WIZBAN_DEPLOY_ONLY_LOGO, createImageDescriptor(pluginBundle, "/icons/blank.gif"));
+ descriptors.put(WIZBAN_JBOSS_LOGO, createImageDescriptor(pluginBundle, "/icons/JBoss_byRH_logo_rgb.png"));
descriptors.put(TWIDDLE_IMAGE, createImageDescriptor(pluginBundle, "icons/twiddle.gif"));
descriptors.put(INACTIVE_CATEGORY_IMAGE, createImageDescriptor(pluginBundle, "/icons/inactiveCat.gif"));
descriptors.put(PUBLISH_IMAGE, createImageDescriptor(pluginBundle, "/icons/publish.gif"));
Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-08-07 22:36:26 UTC (rev 17025)
+++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-08-07 22:42:48 UTC (rev 17026)
@@ -139,24 +139,7 @@
}
protected ImageDescriptor getImageDescriptor() {
- IRuntime rt = (IRuntime) getTaskModel().getObject(
- TaskModel.TASK_RUNTIME);
- String id = rt.getRuntimeType().getId();
- String imageKey = JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO;
- if (id.equals("org.jboss.ide.eclipse.as.runtime.32"))
- imageKey = JBossServerUISharedImages.WIZBAN_JBOSS32_LOGO;
- else if (id.equals("org.jboss.ide.eclipse.as.runtime.40"))
- imageKey = JBossServerUISharedImages.WIZBAN_JBOSS40_LOGO;
- else if (id.equals("org.jboss.ide.eclipse.as.runtime.42"))
- imageKey = JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO;
- else if (id.equals("org.jboss.ide.eclipse.as.runtime.50"))
- imageKey = JBossServerUISharedImages.WIZBAN_JBOSS50_LOGO;
- else if (id.equals("org.jboss.ide.eclipse.as.runtime.51"))
- imageKey = JBossServerUISharedImages.WIZBAN_JBOSS51_LOGO;
- else if( id.equals("org.jboss.ide.eclipse.as.runtime.eap.43"))
- imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO_43;
- else if( id.equals("org.jboss.ide.eclipse.as.runtime.eap.50"))
- imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO_50;
+ String imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_LOGO;
return JBossServerUISharedImages.getImageDescriptor(imageKey);
}
Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
===================================================================
--- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-08-07 22:36:26 UTC (rev 17025)
+++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-08-07 22:42:48 UTC (rev 17026)
@@ -100,17 +100,7 @@
}
public ImageDescriptor getImageDescriptor() {
- IRuntime rt = (IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME);
- String id = rt.getRuntimeType().getId();
- String imageKey = "";
- if( id.equals("org.jboss.ide.eclipse.as.runtime.32")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS32_LOGO;
- else if( id.equals("org.jboss.ide.eclipse.as.runtime.40")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS40_LOGO;
- else if( id.equals("org.jboss.ide.eclipse.as.runtime.42")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO;
- else if( id.equals("org.jboss.ide.eclipse.as.runtime.50")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS50_LOGO;
- else if( id.equals("org.jboss.ide.eclipse.as.runtime.51")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS51_LOGO;
- else if( id.equals("org.jboss.ide.eclipse.as.runtime.eap.43")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO_43;
- else if( id.equals("org.jboss.ide.eclipse.as.runtime.eap.50")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO_50;
-
+ String imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_LOGO;
return JBossServerUISharedImages.getImageDescriptor(imageKey);
}
Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java
===================================================================
--- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java 2009-08-07 22:36:26 UTC (rev 17025)
+++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java 2009-08-07 22:42:48 UTC (rev 17026)
@@ -172,7 +172,7 @@
tempDeployText.addModifyListener(ml);
nameText.addModifyListener(ml);
nameText.setText(getDefaultNameText());
- handle.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.WIZBAN_DEPLOY_ONLY_LOGO));
+ handle.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.WIZBAN_JBOSS_LOGO));
return main;
}
16 years, 4 months
JBoss Tools SVN: r17025 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-08-07 18:36:26 -0400 (Fri, 07 Aug 2009)
New Revision: 17025
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/JBoss_byRH_logo_rgb.png
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo32.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo40.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo42.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo50.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo51.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP43.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP50.gif
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java
Log:
JBIDE-4709 new logo
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/JBoss_byRH_logo_rgb.png
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/JBoss_byRH_logo_rgb.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo32.gif
===================================================================
(Binary files differ)
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo40.gif
===================================================================
(Binary files differ)
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo42.gif
===================================================================
(Binary files differ)
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo50.gif
===================================================================
(Binary files differ)
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo51.gif
===================================================================
(Binary files differ)
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP.gif
===================================================================
(Binary files differ)
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP43.gif
===================================================================
(Binary files differ)
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP50.gif
===================================================================
(Binary files differ)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2009-08-07 22:07:58 UTC (rev 17024)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2009-08-07 22:36:26 UTC (rev 17025)
@@ -39,14 +39,7 @@
public static final String IMG_JBOSS = "jboss"; //$NON-NLS-1$
public static final String IMG_JBOSS_CONFIGURATION = "jbossconfiguration"; //$NON-NLS-1$
- public static final String WIZBAN_JBOSS32_LOGO = "jboss3.2logo"; //$NON-NLS-1$
- public static final String WIZBAN_JBOSS40_LOGO = "jboss4.0logo"; //$NON-NLS-1$
- public static final String WIZBAN_JBOSS42_LOGO = "jboss4.2logo"; //$NON-NLS-1$
- public static final String WIZBAN_JBOSS50_LOGO = "jboss5.0logo"; //$NON-NLS-1$
- public static final String WIZBAN_JBOSS51_LOGO = "jboss5.1logo"; //$NON-NLS-1$
- public static final String WIZBAN_JBOSS_EAP_LOGO_43 = "jbossEAPlogo43"; //$NON-NLS-1$
- public static final String WIZBAN_JBOSS_EAP_LOGO_50 = "jbossEAPlogo50"; //$NON-NLS-1$
- public static final String WIZBAN_DEPLOY_ONLY_LOGO = "jbossdeployerlogo"; //$NON-NLS-1$
+ public static final String WIZBAN_JBOSS_LOGO = "jbossLogo"; //$NON-NLS-1$
public static final String TWIDDLE_IMAGE = "TWIDDLE_IMAGE"; //$NON-NLS-1$
public static final String INACTIVE_CATEGORY_IMAGE = "INACTIVE_CATEGORY_IMAGE"; //$NON-NLS-1$
public static final String GENERIC_SERVER_IMAGE = "GENERIC_SERVER_IMAGE"; //$NON-NLS-1$
@@ -73,14 +66,7 @@
descriptors.put(IMG_JBOSS, createImageDescriptor(pluginBundle, "/icons/jboss.gif")); //$NON-NLS-1$
descriptors.put(IMG_JBOSS_CONFIGURATION, createImageDescriptor(pluginBundle, "/icons/jboss-configuration.gif")); //$NON-NLS-1$
- descriptors.put(WIZBAN_JBOSS32_LOGO, createImageDescriptor(pluginBundle, "/icons/logo32.gif")); //$NON-NLS-1$
- descriptors.put(WIZBAN_JBOSS40_LOGO, createImageDescriptor(pluginBundle, "/icons/logo40.gif")); //$NON-NLS-1$
- descriptors.put(WIZBAN_JBOSS42_LOGO, createImageDescriptor(pluginBundle, "/icons/logo42.gif")); //$NON-NLS-1$
- descriptors.put(WIZBAN_JBOSS50_LOGO, createImageDescriptor(pluginBundle, "/icons/logo50.gif")); //$NON-NLS-1$
- descriptors.put(WIZBAN_JBOSS51_LOGO, createImageDescriptor(pluginBundle, "/icons/logo51.gif")); //$NON-NLS-1$
- descriptors.put(WIZBAN_JBOSS_EAP_LOGO_43, createImageDescriptor(pluginBundle, "/icons/logoEAP43.gif")); //$NON-NLS-1$
- descriptors.put(WIZBAN_JBOSS_EAP_LOGO_50, createImageDescriptor(pluginBundle, "/icons/logoEAP50.gif")); //$NON-NLS-1$
- descriptors.put(WIZBAN_DEPLOY_ONLY_LOGO, createImageDescriptor(pluginBundle, "/icons/blank.gif")); //$NON-NLS-1$
+ descriptors.put(WIZBAN_JBOSS_LOGO, createImageDescriptor(pluginBundle, "/icons/JBoss_byRH_logo_rgb.png")); //$NON-NLS-1$
descriptors.put(TWIDDLE_IMAGE, createImageDescriptor(pluginBundle, "icons/twiddle.gif")); //$NON-NLS-1$
descriptors.put(INACTIVE_CATEGORY_IMAGE, createImageDescriptor(pluginBundle, "/icons/inactiveCat.gif")); //$NON-NLS-1$
descriptors.put(PUBLISH_IMAGE, createImageDescriptor(pluginBundle, "/icons/publish.gif")); //$NON-NLS-1$
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-08-07 22:07:58 UTC (rev 17024)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-08-07 22:36:26 UTC (rev 17025)
@@ -81,7 +81,6 @@
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.util.FileUtil;
import org.jboss.ide.eclipse.as.core.util.IConstants;
-import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants;
import org.jboss.ide.eclipse.as.core.util.JBossServerType;
import org.jboss.ide.eclipse.as.core.util.ServerBeanLoader;
import org.jboss.ide.eclipse.as.ui.IPreferenceKeys;
@@ -160,24 +159,7 @@
}
protected ImageDescriptor getImageDescriptor() {
- IRuntime rt = (IRuntime) getTaskModel().getObject(
- TaskModel.TASK_RUNTIME);
- String id = rt.getRuntimeType().getId();
- String imageKey = JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO;
- if (id.equals(IJBossToolingConstants.AS_32))
- imageKey = JBossServerUISharedImages.WIZBAN_JBOSS32_LOGO;
- else if (id.equals(IJBossToolingConstants.AS_40))
- imageKey = JBossServerUISharedImages.WIZBAN_JBOSS40_LOGO;
- else if (id.equals(IJBossToolingConstants.AS_42))
- imageKey = JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO;
- else if (id.equals(IJBossToolingConstants.AS_50))
- imageKey = JBossServerUISharedImages.WIZBAN_JBOSS50_LOGO;
- else if (id.equals(IJBossToolingConstants.AS_51))
- imageKey = JBossServerUISharedImages.WIZBAN_JBOSS51_LOGO;
- else if (id.equals(IJBossToolingConstants.EAP_43))
- imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO_43;
- else if (id.equals(IJBossToolingConstants.EAP_50))
- imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO_50;
+ String imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_LOGO;
return JBossServerUISharedImages.getImageDescriptor(imageKey);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-08-07 22:07:58 UTC (rev 17024)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-08-07 22:36:26 UTC (rev 17025)
@@ -44,7 +44,6 @@
import org.jboss.ide.eclipse.as.core.server.IDeployableServer;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
import org.jboss.ide.eclipse.as.core.server.internal.JBossServer;
-import org.jboss.ide.eclipse.as.core.util.IConstants;
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
import org.jboss.ide.eclipse.as.ui.Messages;
@@ -96,17 +95,7 @@
}
public ImageDescriptor getImageDescriptor() {
- IRuntime rt = (IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME);
- String id = rt.getRuntimeType().getId();
- String imageKey = ""; //$NON-NLS-1$
- if( id.equals(IConstants.AS_32)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS32_LOGO;
- else if( id.equals(IConstants.AS_40)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS40_LOGO;
- else if( id.equals(IConstants.AS_42)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS42_LOGO;
- else if( id.equals(IConstants.AS_50)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS50_LOGO;
- else if( id.equals(IConstants.AS_51)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS51_LOGO;
- else if( id.equals(IConstants.EAP_43)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO_43;
- else if( id.equals(IConstants.EAP_50)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO_50;
-
+ String imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_LOGO;
return JBossServerUISharedImages.getImageDescriptor(imageKey);
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java 2009-08-07 22:07:58 UTC (rev 17024)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/StrippedServerWizardFragment.java 2009-08-07 22:36:26 UTC (rev 17025)
@@ -172,7 +172,7 @@
tempDeployText.addModifyListener(ml);
nameText.addModifyListener(ml);
nameText.setText(getDefaultNameText());
- handle.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.WIZBAN_DEPLOY_ONLY_LOGO));
+ handle.setImageDescriptor(JBossServerUISharedImages.getImageDescriptor(JBossServerUISharedImages.WIZBAN_JBOSS_LOGO));
return main;
}
16 years, 4 months
JBoss Tools SVN: r17024 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-08-07 18:07:58 -0400 (Fri, 07 Aug 2009)
New Revision: 17024
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
Log:
JBIDE-4726 error message wasn't updating if there was originally 0 java6 jres available
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-08-07 22:06:01 UTC (rev 17023)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-08-07 22:07:58 UTC (rev 17024)
@@ -375,6 +375,7 @@
String currentVM = jreCombo.getText();
if (showPreferencePage()) {
updateJREs();
+ updateErrorMessage();
jreCombo.setItems(jreNames);
jreCombo.setText(currentVM);
if (jreCombo.getSelectionIndex() == -1)
@@ -930,4 +931,4 @@
return newConfig;
}
}
-}
\ No newline at end of file
+}
16 years, 4 months
JBoss Tools SVN: r17023 - in branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-08-07 18:06:01 -0400 (Fri, 07 Aug 2009)
New Revision: 17023
Modified:
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
Log:
JBIDE-4726 in branch for jbds
Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java
===================================================================
--- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2009-08-07 21:20:18 UTC (rev 17022)
+++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.java 2009-08-07 22:06:01 UTC (rev 17023)
@@ -46,6 +46,7 @@
public static String rwf_nameTextBlank;
public static String rwf_homeDirBlank;
public static String rwf_NoVMSelected;
+ public static String rwf_jre6NotFound;
public static String swf_Title;
public static String swf_RuntimeInformation;
public static String swf_AuthorizationDescription;
Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties
===================================================================
--- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-08-07 21:20:18 UTC (rev 17022)
+++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/Messages.properties 2009-08-07 22:06:01 UTC (rev 17023)
@@ -16,6 +16,7 @@
rwf_nameTextBlank=The name field must not be blank
rwf_homeDirBlank=The directory field must not be blank
rwf_NoVMSelected=No VM selected
+rwf_jre6NotFound=No Java 6 runtime environment found
JBAS_version=JBoss Application Server {0}
JBEAP_version=JBoss Enterprise Application Platform {0}
swf_Title=Create a new JBoss Server
Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java
===================================================================
--- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-08-07 21:20:18 UTC (rev 17022)
+++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-08-07 22:06:01 UTC (rev 17023)
@@ -337,8 +337,9 @@
jreCombo = new Combo(jreComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
jreCombo.setItems(jreNames);
- jreCombo.select(defaultVMIndex);
-
+ if( defaultVMIndex != -1 )
+ jreCombo.select(defaultVMIndex);
+
jreButton = new Button(jreComposite, SWT.NONE);
jreButton.setText(Messages.wf_JRELabel);
@@ -348,6 +349,7 @@
String currentVM = jreCombo.getText();
if (showPreferencePage()) {
updateJREs();
+ updateErrorMessage();
jreCombo.setItems(jreNames);
jreCombo.setText(currentVM);
if (jreCombo.getSelectionIndex() == -1)
@@ -462,7 +464,7 @@
handle.setMessage(error, IMessageProvider.ERROR);
}
- private String getErrorString() {
+ protected String getErrorString() {
if (nameText == null) {
// not yet initialized. no errors
return null;
@@ -561,29 +563,39 @@
// JRE methods
protected void updateJREs() {
// get all installed JVMs
- installedJREs = new ArrayList<IVMInstall>();
+ installedJREs = getValidJREs();
+ // get names
+ int size = installedJREs.size();
+ size = shouldIncludeDefaultJRE() ? size+1 : size;
+ int index = 0;
+ jreNames = new String[size];
+ if( shouldIncludeDefaultJRE())
+ jreNames[index++] = "Default JRE"; //$NON-NLS-1$
+
+ for (int i = 0; i < installedJREs.size(); i++) {
+ IVMInstall vmInstall = installedJREs.get(i);
+ jreNames[index++] = vmInstall.getName();
+ }
+ defaultVMIndex = shouldIncludeDefaultJRE() ? 0 :
+ jreNames.length > 0 ? 0 : -1;
+ }
+
+ protected boolean shouldIncludeDefaultJRE() {
+ return true;
+ }
+
+ protected ArrayList<IVMInstall> getValidJREs() {
+ ArrayList<IVMInstall> valid = new ArrayList<IVMInstall>();
IVMInstallType[] vmInstallTypes = JavaRuntime.getVMInstallTypes();
int size = vmInstallTypes.length;
for (int i = 0; i < size; i++) {
IVMInstall[] vmInstalls = vmInstallTypes[i].getVMInstalls();
int size2 = vmInstalls.length;
for (int j = 0; j < size2; j++) {
- installedJREs.add(vmInstalls[j]);
+ valid.add(vmInstalls[j]);
}
}
-
- // get names
- size = installedJREs.size();
- jreNames = new String[size+1];
- jreNames[0] = "Default JRE";
- for (int i = 0; i < size; i++) {
- IVMInstall vmInstall = installedJREs.get(i);
- jreNames[i+1] = vmInstall.getName();
- }
-
- //selectedVM = JavaRuntime.getDefaultVMInstall();
- //defaultVMIndex = installedJREs.indexOf(selectedVM);
- defaultVMIndex = 0;
+ return valid;
}
// WST API methods
Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml
===================================================================
--- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2009-08-07 21:20:18 UTC (rev 17022)
+++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 2009-08-07 22:06:01 UTC (rev 17023)
@@ -30,9 +30,14 @@
point="org.eclipse.wst.server.ui.wizardFragments">
<fragment
class="org.jboss.ide.eclipse.as.ui.wizards.JBossRuntimeWizardFragment"
- typeIds="org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.eap.43,org.jboss.ide.eclipse.as.runtime.eap.50"
- id="org.jboss.ide.eclipse.as.ui.jboss32RuntimeWizardFragmentragment"/>
+ typeIds="org.jboss.ide.eclipse.as.runtime.32,org.jboss.ide.eclipse.as.runtime.40,org.jboss.ide.eclipse.as.runtime.42,org.jboss.ide.eclipse.as.runtime.50,org.jboss.ide.eclipse.as.runtime.51,org.jboss.ide.eclipse.as.runtime.eap.43"
+ id="org.jboss.ide.eclipse.as.ui.JBossRuntimeWizardFragment"/>
+ <!-- Fragment for runtimes that require java 6 -->
<fragment
+ class="org.jboss.ide.eclipse.as.ui.wizards.JBossRuntimeJava6WizardFragment"
+ typeIds="org.jboss.ide.eclipse.as.runtime.eap.50"
+ id="org.jboss.ide.eclipse.as.ui.JBossRuntimeJava6WizardFragment"/>
+ <fragment
class="org.jboss.ide.eclipse.as.ui.wizards.JBossServerWizardFragment"
id="org.jboss.ide.eclipse.as.ui.jbossServerWizardFragment"
typeIds="org.jboss.ide.eclipse.as.32,org.jboss.ide.eclipse.as.40,org.jboss.ide.eclipse.as.42,org.jboss.ide.eclipse.as.50,org.jboss.ide.eclipse.as.51,org.jboss.ide.eclipse.as.eap.43,org.jboss.ide.eclipse.as.eap.50"/>
16 years, 4 months
JBoss Tools SVN: r17022 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-08-07 17:20:18 -0400 (Fri, 07 Aug 2009)
New Revision: 17022
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java
Log:
JBIDE-4726 - made a mistake
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java 2009-08-07 21:14:15 UTC (rev 17021)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java 2009-08-07 21:20:18 UTC (rev 17022)
@@ -58,11 +58,11 @@
}
protected boolean isValidVersion(String version) {
- return !version.equals(JavaCore.VERSION_1_1) &&
- !version.equals(JavaCore.VERSION_1_2) &&
- !version.equals(JavaCore.VERSION_1_3) &&
- !version.equals(JavaCore.VERSION_1_4) &&
- !version.equals(JavaCore.VERSION_1_5);
+ return !version.startsWith(JavaCore.VERSION_1_1) &&
+ !version.startsWith(JavaCore.VERSION_1_2) &&
+ !version.startsWith(JavaCore.VERSION_1_3) &&
+ !version.startsWith(JavaCore.VERSION_1_4) &&
+ !version.startsWith(JavaCore.VERSION_1_5);
}
protected String getErrorString() {
16 years, 4 months
JBoss Tools SVN: r17021 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2009-08-07 17:14:15 -0400 (Fri, 07 Aug 2009)
New Revision: 17021
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java
Log:
JBIDE-4726
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java 2009-08-07 17:26:07 UTC (rev 17020)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeJava6WizardFragment.java 2009-08-07 21:14:15 UTC (rev 17021)
@@ -23,6 +23,7 @@
import java.util.ArrayList;
+import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.jdt.launching.IVMInstall2;
import org.eclipse.jdt.launching.IVMInstallType;
@@ -48,7 +49,7 @@
for (int j = 0; j < size2; j++) {
if( vmInstalls[j] instanceof IVMInstall2 ) {
String version = ((IVMInstall2)vmInstalls[j]).getJavaVersion();
- if( version.startsWith("1.6."))
+ if( isValidVersion(version))
valid.add(vmInstalls[j]);
}
}
@@ -56,6 +57,14 @@
return valid;
}
+ protected boolean isValidVersion(String version) {
+ return !version.equals(JavaCore.VERSION_1_1) &&
+ !version.equals(JavaCore.VERSION_1_2) &&
+ !version.equals(JavaCore.VERSION_1_3) &&
+ !version.equals(JavaCore.VERSION_1_4) &&
+ !version.equals(JavaCore.VERSION_1_5);
+ }
+
protected String getErrorString() {
if( !shouldIncludeDefaultJRE() && getValidJREs().size() == 0 )
return Messages.rwf_jre6NotFound;
16 years, 4 months
JBoss Tools SVN: r17020 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-08-07 13:26:07 -0400 (Fri, 07 Aug 2009)
New Revision: 17020
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/DiagramBaseAction.java
Log:
JBIDE-4669 - update for enable action
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/DiagramBaseAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/DiagramBaseAction.java 2009-08-07 16:45:32 UTC (rev 17019)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/DiagramBaseAction.java 2009-08-07 17:26:07 UTC (rev 17020)
@@ -40,8 +40,4 @@
return res;
}
- public boolean isEnabled() {
- return (getDiagramViewer() != null);
- }
-
}
16 years, 4 months