JBoss Tools SVN: r28363 - branches/jbosstools-3.2.0.CR1/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: 2011-01-18 11:50:39 -0500 (Tue, 18 Jan 2011)
New Revision: 28363
Modified:
branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java
Log:
JBIDE-8122 cr1 patch2
Modified: branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java 2011-01-18 16:48:09 UTC (rev 28362)
+++ branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java 2011-01-18 16:50:39 UTC (rev 28363)
@@ -59,9 +59,15 @@
}
public IRuntimeWorkingCopy searchForRuntimes(IPath path, ServerBeanLoader loader, IProgressMonitor monitor) {
+ if( monitor.isCanceled())
+ return null;
+
if( loader.getServerType(path.toFile()) != JBossServerType.UNKNOWN) {
// return found
- return createRuntime(path, loader);
+ IRuntimeWorkingCopy wc = createRuntime(path, loader);
+ if( wc == null )
+ monitor.setCanceled(true);
+ return wc;
}
File[] children = path.toFile().listFiles();
children = (children == null ? new File[]{} : children);
15 years, 2 months
JBoss Tools SVN: r28362 - 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: 2011-01-18 11:48:09 -0500 (Tue, 18 Jan 2011)
New Revision: 28362
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java
Log:
JBIDE-8122 patch 2 - trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java 2011-01-18 16:38:51 UTC (rev 28361)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java 2011-01-18 16:48:09 UTC (rev 28362)
@@ -59,9 +59,15 @@
}
public IRuntimeWorkingCopy searchForRuntimes(IPath path, ServerBeanLoader loader, IProgressMonitor monitor) {
+ if( monitor.isCanceled())
+ return null;
+
if( loader.getServerType(path.toFile()) != JBossServerType.UNKNOWN) {
// return found
- return createRuntime(path, loader);
+ IRuntimeWorkingCopy wc = createRuntime(path, loader);
+ if( wc == null )
+ monitor.setCanceled(true);
+ return wc;
}
File[] children = path.toFile().listFiles();
children = (children == null ? new File[]{} : children);
15 years, 2 months
JBoss Tools SVN: r28361 - branches/jbosstools-3.2.0.CR1/cdi/plugins/org.jboss.tools.cdi.ui.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-01-18 11:38:51 -0500 (Tue, 18 Jan 2011)
New Revision: 28361
Modified:
branches/jbosstools-3.2.0.CR1/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties
branches/jbosstools-3.2.0.CR1/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml
Log:
JBIDE-8123
https://issues.jboss.org/browse/JBIDE-8123
Modified: branches/jbosstools-3.2.0.CR1/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties
===================================================================
--- branches/jbosstools-3.2.0.CR1/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties 2011-01-18 16:33:24 UTC (rev 28360)
+++ branches/jbosstools-3.2.0.CR1/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties 2011-01-18 16:38:51 UTC (rev 28361)
@@ -11,8 +11,9 @@
proposalCategory.cdiClass= JBoss CDI (Context and Dependency Injection) Class Proposals
-preferenceKeywords.newJava=CDI
+preferenceKeywords.newJava=CDI type annotation
+preferenceKeywords.newBean=CDI class bean type
preferenceKeywords.newBeansXML=CDI XML
NewWizards.file=File beans.xml
-NewWizards.file.description=Create a new beans.xml File
+NewWizards.file.description=Create a new beans.xml File
\ No newline at end of file
Modified: branches/jbosstools-3.2.0.CR1/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml
===================================================================
--- branches/jbosstools-3.2.0.CR1/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2011-01-18 16:33:24 UTC (rev 28360)
+++ branches/jbosstools-3.2.0.CR1/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2011-01-18 16:38:51 UTC (rev 28361)
@@ -136,10 +136,10 @@
class="org.jboss.tools.cdi.ui.wizard.NewQualifierCreationWizard"
icon="icons/cdi16.png"
id="org.jboss.tools.cdi.ui.wizard.NewQualifierCreationWizard"
- name="Qualifier Annotation Type"
+ name="Qualifier Annotation"
project="false">
<description>
- Create a Qualifier Java File
+ Create a Qualifier Annotation Type
</description>
<keywordReference
id="org.jboss.tools.cdi.ui.newJava">
@@ -151,10 +151,10 @@
class="org.jboss.tools.cdi.ui.wizard.NewStereotypeCreationWizard"
icon="icons/cdi16.png"
id="org.jboss.tools.cdi.ui.wizard.NewStereotypeCreationWizard"
- name="Stereotype Annotation Type"
+ name="Stereotype Annotation"
project="false">
<description>
- Create a Stereotype Java File
+ Create a Stereotype Annotation Type
</description>
<keywordReference
id="org.jboss.tools.cdi.ui.newJava">
@@ -166,10 +166,10 @@
class="org.jboss.tools.cdi.ui.wizard.NewScopeCreationWizard"
icon="icons/cdi16.png"
id="org.jboss.tools.cdi.ui.wizard.NewScopeCreationWizard"
- name="Scope Annotation Type"
+ name="Scope Annotation"
project="false">
<description>
- Create a Scope Java File
+ Create a Scope Annotation Type
</description>
<keywordReference
id="org.jboss.tools.cdi.ui.newJava">
@@ -181,10 +181,10 @@
class="org.jboss.tools.cdi.ui.wizard.NewInterceptorBindingCreationWizard"
icon="icons/cdi16.png"
id="org.jboss.tools.cdi.ui.wizard.NewInterceptorBindingCreationWizard"
- name="Interceptor Binding Annotation Type"
+ name="Interceptor Binding Annotation"
project="false">
<description>
- Create a Interceptor Binding Java File
+ Create a Interceptor Binding Annotation Type
</description>
<keywordReference
id="org.jboss.tools.cdi.ui.newJava">
@@ -196,13 +196,13 @@
class="org.jboss.tools.cdi.ui.wizard.NewInterceptorCreationWizard"
icon="icons/cdi16.png"
id="org.jboss.tools.cdi.ui.wizard.NewInterceptorCreationWizard"
- name="Interceptor Type"
+ name="Interceptor"
project="false">
<description>
- Create an Interceptor Java File
+ Create an Interceptor Type
</description>
<keywordReference
- id="org.jboss.tools.cdi.ui.newJava">
+ id="org.jboss.tools.cdi.ui.newBean">
</keywordReference>
</wizard>
@@ -211,13 +211,13 @@
class="org.jboss.tools.cdi.ui.wizard.NewDecoratorCreationWizard"
icon="icons/cdi16.png"
id="org.jboss.tools.cdi.ui.wizard.NewDecoratorCreationWizard"
- name="Decorator Type"
+ name="Decorator"
project="false">
<description>
- Create an Decorator Java File
+ Create a Decorator Type
</description>
<keywordReference
- id="org.jboss.tools.cdi.ui.newJava">
+ id="org.jboss.tools.cdi.ui.newBean">
</keywordReference>
</wizard>
@@ -226,10 +226,10 @@
class="org.jboss.tools.cdi.ui.wizard.NewAnnotationLiteralCreationWizard"
icon="icons/cdi16.png"
id="org.jboss.tools.cdi.ui.wizard.NewAnnotationLiteralCreationWizard"
- name="Annotation Literal Type"
+ name="Annotation Literal"
project="false">
<description>
- Create an Annotation Literal Java File
+ Create an Annotation Literal Type
</description>
<keywordReference
id="org.jboss.tools.cdi.ui.newJava">
@@ -261,6 +261,9 @@
label="%preferenceKeywords.newJava"
id="org.jboss.tools.cdi.ui.newJava"/>
<keyword
+ label="%preferenceKeywords.newBean"
+ id="org.jboss.tools.cdi.ui.newBean"/>
+ <keyword
label="%preferenceKeywords.newBeansXML"
id="org.jboss.tools.cdi.ui.newBeansXML"/>
@@ -302,4 +305,4 @@
class="org.jboss.tools.cdi.ui.marker.CDIProblemMarkerResolutionGenerator"/>
</extension>
-</plugin>
+</plugin>
\ No newline at end of file
15 years, 2 months
JBoss Tools SVN: r28360 - trunk/cdi/plugins/org.jboss.tools.cdi.ui.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-01-18 11:33:24 -0500 (Tue, 18 Jan 2011)
New Revision: 28360
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties
trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml
Log:
JBIDE-8123
https://issues.jboss.org/browse/JBIDE-8123
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties 2011-01-18 16:31:05 UTC (rev 28359)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.properties 2011-01-18 16:33:24 UTC (rev 28360)
@@ -11,7 +11,8 @@
proposalCategory.cdiClass= JBoss CDI (Context and Dependency Injection) Class Proposals
-preferenceKeywords.newJava=CDI
+preferenceKeywords.newJava=CDI type annotation
+preferenceKeywords.newBean=CDI class bean type
preferenceKeywords.newBeansXML=CDI XML
NewWizards.file=File beans.xml
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2011-01-18 16:31:05 UTC (rev 28359)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/plugin.xml 2011-01-18 16:33:24 UTC (rev 28360)
@@ -136,10 +136,10 @@
class="org.jboss.tools.cdi.ui.wizard.NewQualifierCreationWizard"
icon="icons/cdi16.png"
id="org.jboss.tools.cdi.ui.wizard.NewQualifierCreationWizard"
- name="Qualifier Annotation Type"
+ name="Qualifier Annotation"
project="false">
<description>
- Create a Qualifier Java File
+ Create a Qualifier Annotation Type
</description>
<keywordReference
id="org.jboss.tools.cdi.ui.newJava">
@@ -151,10 +151,10 @@
class="org.jboss.tools.cdi.ui.wizard.NewStereotypeCreationWizard"
icon="icons/cdi16.png"
id="org.jboss.tools.cdi.ui.wizard.NewStereotypeCreationWizard"
- name="Stereotype Annotation Type"
+ name="Stereotype Annotation"
project="false">
<description>
- Create a Stereotype Java File
+ Create a Stereotype Annotation Type
</description>
<keywordReference
id="org.jboss.tools.cdi.ui.newJava">
@@ -166,10 +166,10 @@
class="org.jboss.tools.cdi.ui.wizard.NewScopeCreationWizard"
icon="icons/cdi16.png"
id="org.jboss.tools.cdi.ui.wizard.NewScopeCreationWizard"
- name="Scope Annotation Type"
+ name="Scope Annotation"
project="false">
<description>
- Create a Scope Java File
+ Create a Scope Annotation Type
</description>
<keywordReference
id="org.jboss.tools.cdi.ui.newJava">
@@ -181,10 +181,10 @@
class="org.jboss.tools.cdi.ui.wizard.NewInterceptorBindingCreationWizard"
icon="icons/cdi16.png"
id="org.jboss.tools.cdi.ui.wizard.NewInterceptorBindingCreationWizard"
- name="Interceptor Binding Annotation Type"
+ name="Interceptor Binding Annotation"
project="false">
<description>
- Create a Interceptor Binding Java File
+ Create a Interceptor Binding Annotation Type
</description>
<keywordReference
id="org.jboss.tools.cdi.ui.newJava">
@@ -196,13 +196,13 @@
class="org.jboss.tools.cdi.ui.wizard.NewInterceptorCreationWizard"
icon="icons/cdi16.png"
id="org.jboss.tools.cdi.ui.wizard.NewInterceptorCreationWizard"
- name="Interceptor Type"
+ name="Interceptor"
project="false">
<description>
- Create an Interceptor Java File
+ Create an Interceptor Type
</description>
<keywordReference
- id="org.jboss.tools.cdi.ui.newJava">
+ id="org.jboss.tools.cdi.ui.newBean">
</keywordReference>
</wizard>
@@ -211,13 +211,13 @@
class="org.jboss.tools.cdi.ui.wizard.NewDecoratorCreationWizard"
icon="icons/cdi16.png"
id="org.jboss.tools.cdi.ui.wizard.NewDecoratorCreationWizard"
- name="Decorator Type"
+ name="Decorator"
project="false">
<description>
- Create an Decorator Java File
+ Create a Decorator Type
</description>
<keywordReference
- id="org.jboss.tools.cdi.ui.newJava">
+ id="org.jboss.tools.cdi.ui.newBean">
</keywordReference>
</wizard>
@@ -226,10 +226,10 @@
class="org.jboss.tools.cdi.ui.wizard.NewAnnotationLiteralCreationWizard"
icon="icons/cdi16.png"
id="org.jboss.tools.cdi.ui.wizard.NewAnnotationLiteralCreationWizard"
- name="Annotation Literal Type"
+ name="Annotation Literal"
project="false">
<description>
- Create an Annotation Literal Java File
+ Create an Annotation Literal Type
</description>
<keywordReference
id="org.jboss.tools.cdi.ui.newJava">
@@ -261,6 +261,9 @@
label="%preferenceKeywords.newJava"
id="org.jboss.tools.cdi.ui.newJava"/>
<keyword
+ label="%preferenceKeywords.newBean"
+ id="org.jboss.tools.cdi.ui.newBean"/>
+ <keyword
label="%preferenceKeywords.newBeansXML"
id="org.jboss.tools.cdi.ui.newBeansXML"/>
15 years, 2 months
JBoss Tools SVN: r28359 - in trunk/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-01-18 11:31:05 -0500 (Tue, 18 Jan 2011)
New Revision: 28359
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java
Log:
JBIDE-8122 trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java 2011-01-18 16:28:25 UTC (rev 28358)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java 2011-01-18 16:31:05 UTC (rev 28359)
@@ -102,4 +102,5 @@
public static final String DESCRIPTOR_CLIENT = "META-INF/application-client.xml"; //$NON-NLS-1$
public static final String DESCRIPTOR_CONNECTOR = "META-INF/ra.xml"; //$NON-NLS-1$
public static final String JBOSS_AS = "JBOSS_AS"; //$NON-NLS-1$
+ public static final String JBOSS_AS_EAP_DIRECTORY = "jboss-as"; //$NON-NLS-1$
}
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java 2011-01-18 16:28:25 UTC (rev 28358)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java 2011-01-18 16:31:05 UTC (rev 28359)
@@ -131,7 +131,7 @@
else
runtimeTypeId=IJBossToolingConstants.EAP_50;
- IPath path2 = path.append(IJBossRuntimeResourceConstants.JBOSS_AS);
+ IPath path2 = path.append(IJBossRuntimeResourceConstants.JBOSS_AS_EAP_DIRECTORY);
if( runtimeTypeId != null ) {
try {
IRuntimeWorkingCopy wc = createRuntimeWorkingCopy(runtimeTypeId, path2.toOSString(), IJBossRuntimeResourceConstants.DEFAULT_CONFIGURATION);
15 years, 2 months
JBoss Tools SVN: r28358 - in branches/jbosstools-3.2.0.CR1/as/plugins: org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-01-18 11:28:25 -0500 (Tue, 18 Jan 2011)
New Revision: 28358
Modified:
branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java
branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java
Log:
JBIDE-8122 cr1 patch from snjezana
Modified: branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java 2011-01-18 16:21:41 UTC (rev 28357)
+++ branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/IJBossRuntimeResourceConstants.java 2011-01-18 16:28:25 UTC (rev 28358)
@@ -102,4 +102,5 @@
public static final String DESCRIPTOR_CLIENT = "META-INF/application-client.xml"; //$NON-NLS-1$
public static final String DESCRIPTOR_CONNECTOR = "META-INF/ra.xml"; //$NON-NLS-1$
public static final String JBOSS_AS = "JBOSS_AS"; //$NON-NLS-1$
+ public static final String JBOSS_AS_EAP_DIRECTORY = "jboss-as"; //$NON-NLS-1$
}
Modified: branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java 2011-01-18 16:21:41 UTC (rev 28357)
+++ branches/jbosstools-3.2.0.CR1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeLocator.java 2011-01-18 16:28:25 UTC (rev 28358)
@@ -131,7 +131,7 @@
else
runtimeTypeId=IJBossToolingConstants.EAP_50;
- IPath path2 = path.append(IJBossRuntimeResourceConstants.JBOSS_AS);
+ IPath path2 = path.append(IJBossRuntimeResourceConstants.JBOSS_AS_EAP_DIRECTORY);
if( runtimeTypeId != null ) {
try {
IRuntimeWorkingCopy wc = createRuntimeWorkingCopy(runtimeTypeId, path2.toOSString(), IJBossRuntimeResourceConstants.DEFAULT_CONFIGURATION);
15 years, 2 months
JBoss Tools SVN: r28357 - branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-01-18 11:21:41 -0500 (Tue, 18 Jan 2011)
New Revision: 28357
Modified:
branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
Log:
JBIDE-8144 to branch
Modified: branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-01-18 16:21:35 UTC (rev 28356)
+++ branches/jbosstools-3.2.0.CR1/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-01-18 16:21:41 UTC (rev 28357)
@@ -290,6 +290,9 @@
// ignore
}
+ if( !createRSE.getSelection())
+ return null;
+
CreateRSEFromInstanceJob j =
new CreateRSEFromInstanceJob(instance, INewInstanceWizardPage.NEW_INSTANCE_FAMILY);
15 years, 2 months
JBoss Tools SVN: r28356 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/handlers.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2011-01-18 11:21:35 -0500 (Tue, 18 Jan 2011)
New Revision: 28356
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/handlers/I18nHandler.java
Log:
https://issues.jboss.org/browse/JBIDE-8138
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/handlers/I18nHandler.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/handlers/I18nHandler.java 2011-01-18 16:17:44 UTC (rev 28355)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/i18n/handlers/I18nHandler.java 2011-01-18 16:21:35 UTC (rev 28356)
@@ -17,10 +17,12 @@
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.HandlerEvent;
+import org.eclipse.core.expressions.IEvaluationContext;
import org.eclipse.jface.text.TextSelection;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.ISources;
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.commands.IElementUpdater;
import org.eclipse.ui.handlers.HandlerUtil;
@@ -40,17 +42,16 @@
@Override
public void setEnabled(Object evaluationContext) {
- IEditorPart activeEditor= PlatformUI
- .getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
- boolean enabled;
- if(activeEditor instanceof ITextEditor){
- ITextEditor txtEditor = (ITextEditor) activeEditor;
- ISelection selection = txtEditor.getSelectionProvider().getSelection();
- enabled = getExternalizeStringsCommandEnabled(selection);
- } else {
- enabled = false;
+ boolean enabled=false;
+ if (evaluationContext instanceof IEvaluationContext) {
+ IEvaluationContext context = (IEvaluationContext) evaluationContext;
+ Object activeEditor = context.getVariable(ISources.ACTIVE_EDITOR_NAME);
+ if(activeEditor instanceof ITextEditor){
+ ITextEditor txtEditor = (ITextEditor) activeEditor;
+ ISelection selection = txtEditor.getSelectionProvider().getSelection();
+ enabled = getExternalizeStringsCommandEnabled(selection);
+ }
}
-
if (isEnabled() != enabled) {
setBaseEnabled(enabled);
}
15 years, 2 months
JBoss Tools SVN: r28355 - trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-01-18 11:17:44 -0500 (Tue, 18 Jan 2011)
New Revision: 28355
Modified:
trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
Log:
JBIDE-8144 to trunk
Modified: trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java
===================================================================
--- trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-01-18 14:20:03 UTC (rev 28354)
+++ trunk/deltacloud/plugins/org.jboss.tools.deltacloud.integration/src/org/jboss/tools/deltacloud/integration/wizard/RSEandASWizardPage.java 2011-01-18 16:17:44 UTC (rev 28355)
@@ -290,6 +290,9 @@
// ignore
}
+ if( !createRSE.getSelection())
+ return null;
+
CreateRSEFromInstanceJob j =
new CreateRSEFromInstanceJob(instance, INewInstanceWizardPage.NEW_INSTANCE_FAMILY);
15 years, 2 months
JBoss Tools SVN: r28354 - branches/jbosstools-3.2.0.CR1/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-01-18 09:20:03 -0500 (Tue, 18 Jan 2011)
New Revision: 28354
Modified:
branches/jbosstools-3.2.0.CR1/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java
Log:
JBIDE-8106 Teiid Project Examples NPE
Modified: branches/jbosstools-3.2.0.CR1/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java
===================================================================
--- branches/jbosstools-3.2.0.CR1/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2011-01-18 13:52:13 UTC (rev 28353)
+++ branches/jbosstools-3.2.0.CR1/examples/plugins/org.jboss.tools.project.examples/src/org/jboss/tools/project/examples/wizard/NewProjectExamplesWizard.java 2011-01-18 14:20:03 UTC (rev 28354)
@@ -587,6 +587,9 @@
String prefix = projectName + "/"; //$NON-NLS-1$
while (entries.hasMoreElements()) {
entry = entries.nextElement();
+ if (entry.isDirectory()) {
+ continue;
+ }
if (entry.getName().startsWith(prefix)) {
filesToImport.add(entry);
}
15 years, 2 months