JBoss Tools SVN: r16787 - trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-07-24 15:47:01 -0400 (Fri, 24 Jul 2009)
New Revision: 16787
Modified:
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java
trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java
Log:
JBIDE-4660: Update and correct the CA-related JUnit tests after the new-style CA is applied.
JsfJspJbide1807Test and JsfJspJbide1813Test Test suites are updated
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2009-07-24 19:25:09 UTC (rev 16786)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/ContentAssistantTestCase.java 2009-07-24 19:47:01 UTC (rev 16787)
@@ -94,7 +94,7 @@
protected boolean compareProposal(String proposalName, ICompletionProposal[] proposals){
for (int i = 0; i < proposals.length; i++) {
- if(proposals[i].getDisplayString().equals(proposalName)) return true;
+ if(proposals[i].getDisplayString().toLowerCase().equals(proposalName.toLowerCase())) return true;
}
return false;
}
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java 2009-07-24 19:25:09 UTC (rev 16786)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java 2009-07-24 19:47:01 UTC (rev 16787)
@@ -26,7 +26,8 @@
// - The "/pages" proposal is added as the main case to test
String[] proposals={
"/pages",
- "/templates"
+ "/templates",
+ "new jsf el expression - create a new attribute value with #{}"
};
checkProposals(PAGE_NAME, "<input type=\"image\" src=\"", 25, proposals, true);
Modified: trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java
===================================================================
--- trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java 2009-07-24 19:25:09 UTC (rev 16786)
+++ trunk/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java 2009-07-24 19:47:01 UTC (rev 16787)
@@ -27,6 +27,7 @@
String[] proposals={
"ltr",
"rtl",
+ "new jsf el expression - create a new attribute value with #{}"
};
checkProposals(PAGE_NAME, "dir=\"\"", 5, proposals, true);
16 years, 8 months
JBoss Tools SVN: r16786 - trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-07-24 15:25:09 -0400 (Fri, 24 Jul 2009)
New Revision: 16786
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java
Log:
JsfTextExtAllTests is updated: an unneeded refresh operation is excluded. (I suppose that it's breaking the Seam model and making the Seam builders to start while there is no waiting procedure is performed after. Because the builders work is done after the test project setup I assume that we don't need an additional refresh here)
Modified: trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java 2009-07-24 19:16:49 UTC (rev 16785)
+++ trunk/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java 2009-07-24 19:25:09 UTC (rev 16786)
@@ -54,12 +54,13 @@
provider = new TestProjectProvider("org.jboss.tools.jsf.text.ext.test", null, PROJECT_NAME, makeCopy);
project = provider.getProject();
Throwable exception = null;
- try {
- project.refreshLocal(IResource.DEPTH_INFINITE, null);
- } catch (Exception x) {
- exception = x;
- x.printStackTrace();
- }
+// try {
+// project.refreshLocal(IResource.DEPTH_INFINITE, null);
+// } catch (Exception x) {
+// exception = x;
+// x.printStackTrace();
+// }
+
assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception);
}
@@ -187,7 +188,7 @@
.append("]");
}
assertMessage.append("}");
-
+
assertTrue(assertMessage.toString() , testResult);
counter++;
} else {
16 years, 8 months
JBoss Tools SVN: r16785 - trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2009-07-24 15:16:49 -0400 (Fri, 24 Jul 2009)
New Revision: 16785
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java
Log:
JBIDE-2808: Improve/refactor org.jboss.tools.common.kb plugin.
Proposals unification procedure is updated.
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2009-07-24 18:33:39 UTC (rev 16784)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2009-07-24 19:16:49 UTC (rev 16785)
@@ -214,7 +214,10 @@
List<IContentAssistProcessor> processors = new LinkedList<IContentAssistProcessor>();
if (fProcessorsMap.get(contentType) != null) {
- processors.addAll(fProcessorsMap.get(contentType).get(fPartitionType));
+ List<IContentAssistProcessor> list = fProcessorsMap.get(contentType).get(fPartitionType);
+ if (list != null) {
+ processors.addAll(list);
+ }
}
if (fProcessorsMap.get(POST_INSTALL_CA_PROCESSORS_CONTENTTYPE_STUB) != null) {
List<IContentAssistProcessor> list = fProcessorsMap.get(POST_INSTALL_CA_PROCESSORS_CONTENTTYPE_STUB).get(fPartitionType);
@@ -268,10 +271,17 @@
infoUnquoted = infoUnquoted.substring(1);
if (infoUnquoted.endsWith("\""))
infoUnquoted = infoUnquoted.substring(0, infoUnquoted.length() - 1);
- infoUnquoted = infoUnquoted.trim();
+ infoUnquoted = infoUnquoted.trim().toLowerCase();
}
- if (!present.contains(proposals[i].getDisplayString())) {
- present.add(proposals[i].getDisplayString());
+ String displayStringUnquoted = proposals[i].getDisplayString().toLowerCase();
+ if (displayStringUnquoted.startsWith("\""))
+ displayStringUnquoted = displayStringUnquoted.substring(1);
+ if (displayStringUnquoted.endsWith("\""))
+ displayStringUnquoted = displayStringUnquoted.substring(0, displayStringUnquoted.length() - 1);
+ displayStringUnquoted = displayStringUnquoted.trim().toLowerCase();
+
+ if (!present.contains(displayStringUnquoted)) {
+ present.add(displayStringUnquoted);
if (infoUnquoted != null && infoUnquoted.length() > 0) {
if (!info.contains(infoUnquoted)) {
info.add(infoUnquoted);
16 years, 8 months
JBoss Tools SVN: r16784 - 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-07-24 14:33:39 -0400 (Fri, 24 Jul 2009)
New Revision: 16784
Added:
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/logoEAP43.gif
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP50.gif
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
Log:
JBIDE-4658 - icons
Added: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo51.gif
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo51.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP43.gif
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP43.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP50.gif
===================================================================
(Binary files differ)
Property changes on: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP50.gif
___________________________________________________________________
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-07-24 18:15:21 UTC (rev 16783)
+++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2009-07-24 18:33:39 UTC (rev 16784)
@@ -43,7 +43,9 @@
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_JBOSS_EAP_LOGO = "jbossEAPlogo";
+ 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 TWIDDLE_IMAGE = "TWIDDLE_IMAGE";
public static final String INACTIVE_CATEGORY_IMAGE = "INACTIVE_CATEGORY_IMAGE";
@@ -75,7 +77,9 @@
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_JBOSS_EAP_LOGO, createImageDescriptor(pluginBundle, "/icons/logoEAP.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(TWIDDLE_IMAGE, createImageDescriptor(pluginBundle, "icons/twiddle.gif"));
descriptors.put(INACTIVE_CATEGORY_IMAGE, createImageDescriptor(pluginBundle, "/icons/inactiveCat.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-07-24 18:15:21 UTC (rev 16783)
+++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-07-24 18:33:39 UTC (rev 16784)
@@ -151,8 +151,12 @@
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;
+ 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;
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-07-24 18:15:21 UTC (rev 16783)
+++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-07-24 18:33:39 UTC (rev 16784)
@@ -107,8 +107,9 @@
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.eap.43")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO;
- else if( id.equals("org.jboss.ide.eclipse.as.runtime.eap.50")) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_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;
return JBossServerUISharedImages.getImageDescriptor(imageKey);
}
16 years, 8 months
JBoss Tools SVN: r16783 - 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-07-24 14:15:21 -0400 (Fri, 24 Jul 2009)
New Revision: 16783
Added:
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
Log:
JBIDE-4610 - icons
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP43.gif
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP43.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP50.gif
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP50.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
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-07-24 16:14:51 UTC (rev 16782)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2009-07-24 18:15:21 UTC (rev 16783)
@@ -44,7 +44,7 @@
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 = "jbossEAPlogo"; //$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 TWIDDLE_IMAGE = "TWIDDLE_IMAGE"; //$NON-NLS-1$
@@ -78,7 +78,7 @@
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, createImageDescriptor(pluginBundle, "/icons/logoEAP.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(TWIDDLE_IMAGE, createImageDescriptor(pluginBundle, "icons/twiddle.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-07-24 16:14:51 UTC (rev 16782)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-07-24 18:15:21 UTC (rev 16783)
@@ -79,7 +79,6 @@
import org.eclipse.wst.server.ui.wizard.WizardFragment;
import org.jboss.ide.eclipse.as.core.server.IJBossServerConstants;
import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime;
-import org.jboss.ide.eclipse.as.core.server.internal.LocalJBossServerRuntime;
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;
@@ -176,9 +175,9 @@
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;
+ imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO_43;
else if (id.equals(IJBossToolingConstants.EAP_50))
- imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO;
+ imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_LOGO_50;
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-07-24 16:14:51 UTC (rev 16782)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-07-24 18:15:21 UTC (rev 16783)
@@ -28,8 +28,6 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.layout.FormAttachment;
import org.eclipse.swt.layout.FormData;
import org.eclipse.swt.layout.FormLayout;
@@ -38,11 +36,8 @@
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.core.TaskModel;
import org.eclipse.wst.server.ui.wizard.IWizardHandle;
import org.eclipse.wst.server.ui.wizard.WizardFragment;
@@ -50,7 +45,6 @@
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.core.util.ServerUtil;
import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
import org.jboss.ide.eclipse.as.ui.Messages;
@@ -110,8 +104,8 @@
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;
- else if( id.equals(IConstants.EAP_50)) imageKey = JBossServerUISharedImages.WIZBAN_JBOSS_EAP_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;
return JBossServerUISharedImages.getImageDescriptor(imageKey);
}
16 years, 8 months
JBoss Tools SVN: r16781 - trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-24 11:40:38 -0400 (Fri, 24 Jul 2009)
New Revision: 16781
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF
Log:
JBIDE-1826
Dependency on old kb plugin removed.
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF 2009-07-24 15:39:52 UTC (rev 16780)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/META-INF/MANIFEST.MF 2009-07-24 15:40:38 UTC (rev 16781)
@@ -32,7 +32,6 @@
org.eclipse.ui.workbench,
org.eclipse.ui.workbench.texteditor,
org.eclipse.jdt.ui,
- org.jboss.tools.common.kb,
org.eclipse.jdt.core,
org.eclipse.wst.xml.ui,
org.eclipse.wst.sse.ui,
16 years, 8 months
JBoss Tools SVN: r16780 - trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-24 11:39:52 -0400 (Fri, 24 Jul 2009)
New Revision: 16780
Modified:
trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java
Log:
JBIDE-1826
Dependency on old kb plugin removed.
Modified: trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2009-07-24 15:38:19 UTC (rev 16779)
+++ trunk/common/plugins/org.jboss.tools.common.text.xml/src/org/jboss/tools/common/text/xml/contentassist/SortingCompoundContentAssistProcessor.java 2009-07-24 15:39:52 UTC (rev 16780)
@@ -217,7 +217,10 @@
processors.addAll(fProcessorsMap.get(contentType).get(fPartitionType));
}
if (fProcessorsMap.get(POST_INSTALL_CA_PROCESSORS_CONTENTTYPE_STUB) != null) {
- processors.addAll(fProcessorsMap.get(POST_INSTALL_CA_PROCESSORS_CONTENTTYPE_STUB).get(fPartitionType));
+ List<IContentAssistProcessor> list = fProcessorsMap.get(POST_INSTALL_CA_PROCESSORS_CONTENTTYPE_STUB).get(fPartitionType);
+ if(list != null) {
+ processors.addAll(list);
+ }
}
if(processors.size() == 0) {
return new ICompletionProposal[0];
16 years, 8 months
JBoss Tools SVN: r16779 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-24 11:38:19 -0400 (Fri, 24 Jul 2009)
New Revision: 16779
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/META-INF/MANIFEST.MF
Log:
JBIDE-1826
Dependency on old kb plugin removed.
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/META-INF/MANIFEST.MF 2009-07-24 15:34:43 UTC (rev 16778)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.xml.ui/META-INF/MANIFEST.MF 2009-07-24 15:38:19 UTC (rev 16779)
@@ -20,7 +20,6 @@
org.eclipse.wst.sse.core,
org.eclipse.core.resources,
org.eclipse.core.runtime,
- org.jboss.tools.common.kb,
org.jboss.tools.common.model,
org.jboss.tools.common.model.ui,
org.jboss.tools.hibernate.xml,
16 years, 8 months
JBoss Tools SVN: r16778 - trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-24 11:34:43 -0400 (Fri, 24 Jul 2009)
New Revision: 16778
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF
Log:
JBIDE-1826
Dependency on old kb plugin removed.
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF 2009-07-24 15:32:35 UTC (rev 16777)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.ui/META-INF/MANIFEST.MF 2009-07-24 15:34:43 UTC (rev 16778)
@@ -38,7 +38,6 @@
org.jboss.tools.common.model.ui,
org.jboss.tools.jst.web,
org.jboss.tools.jst.web.ui,
- org.jboss.tools.common.kb,
org.jboss.tools.common.text.xml,
org.jboss.tools.vpe,
org.jboss.tools.jst.jsp,
16 years, 8 months
JBoss Tools SVN: r16777 - trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2009-07-24 11:32:35 -0400 (Fri, 24 Jul 2009)
New Revision: 16777
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF
Log:
JBIDE-1826
Dependency on old kb plugin removed.
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2009-07-24 15:31:34 UTC (rev 16776)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/META-INF/MANIFEST.MF 2009-07-24 15:32:35 UTC (rev 16777)
@@ -21,7 +21,6 @@
org.jboss.tools.jst.jsp.text,
org.jboss.tools.jst.jsp.ui.action
Require-Bundle: org.jboss.tools.common,
- org.jboss.tools.common.kb,
org.jboss.tools.common.model,
org.jboss.tools.common.el.core,
org.jboss.tools.common.text.xml,
16 years, 8 months