JBoss Tools SVN: r11128 - branches/jbosstools-3.0.0.Beta1/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-10-23 18:06:47 -0400 (Thu, 23 Oct 2008)
New Revision: 11128
Modified:
branches/jbosstools-3.0.0.Beta1/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
branches/jbosstools-3.0.0.Beta1/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java
Log:
Fixing errors in the org.jboss.tools.jsf.vpe.jsf.test tests
Modified: branches/jbosstools-3.0.0.Beta1/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2008-10-23 22:06:42 UTC (rev 11127)
+++ branches/jbosstools-3.0.0.Beta1/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/ComponentContentTest.java 2008-10-23 22:06:47 UTC (rev 11128)
@@ -133,7 +133,11 @@
assertNotNull(xmlModelElement);
// compare DOMs
- TestDomUtil.compareNodes(vpeElement, xmlModelElement);
+ try {
+ TestDomUtil.compareNodes(vpeElement, xmlModelElement);
+ } catch (ComparisonException e) {
+ fail(e.getMessage());
+ }
}
Modified: branches/jbosstools-3.0.0.Beta1/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2008-10-23 22:06:42 UTC (rev 11127)
+++ branches/jbosstools-3.0.0.Beta1/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2008-10-23 22:06:47 UTC (rev 11128)
@@ -193,14 +193,18 @@
/**
* Wait for idle.
*/
- public static void waitForIdle() {
+ public static void waitForIdle(long maxIdle) {
long start = System.currentTimeMillis();
while (!Job.getJobManager().isIdle()) {
delay(500);
- if ( (System.currentTimeMillis()-start) > MAX_IDLE )
+ if ( (System.currentTimeMillis()-start) > maxIdle )
throw new RuntimeException("A long running task detected"); //$NON-NLS-1$
}
}
+
+ public static void waitForIdle() {
+ waitForIdle(MAX_IDLE);
+ }
/**
* find elements by name.
16 years, 2 months
JBoss Tools SVN: r11127 - branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-10-23 18:06:42 -0400 (Thu, 23 Oct 2008)
New Revision: 11127
Modified:
branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java
branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
Log:
Fixing errors in the org.jboss.tools.jsf.vpe.jsf.test tests
Modified: branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java 2008-10-23 22:06:37 UTC (rev 11126)
+++ branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java 2008-10-23 22:06:42 UTC (rev 11127)
@@ -75,7 +75,7 @@
job.setPriority(Job.SHORT);
job.schedule(0L);
job.join();
- TestUtil.waitForIdle();
+ TestUtil.waitForIdle(15*1000*60);
TestUtil.delay(1000L);
closeEditors();
Modified: branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-10-23 22:06:37 UTC (rev 11126)
+++ branches/jbosstools-3.0.0.Beta1/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-10-23 22:06:42 UTC (rev 11127)
@@ -259,55 +259,59 @@
assertNotNull("Editor input is null", input); //$NON-NLS-1$
// open and get editor
- JSPMultiPageEditor part = openEditor(input);
-
- int position = TestUtil.getLinePositionOffcet(part.getSourceEditor().getTextViewer(), lineIndex, linePosition);
+ ICompletionProposal[] results;
+ try {
+ JSPMultiPageEditor part = openEditor(input);
+
+ int position = TestUtil.getLinePositionOffcet(part.getSourceEditor().getTextViewer(), lineIndex, linePosition);
- // insert string
- part.getSourceEditor().getTextViewer().getTextWidget()
- .replaceTextRange(position, 0, partOfString);
+ // insert string
+ part.getSourceEditor().getTextViewer().getTextWidget()
+ .replaceTextRange(position, 0, partOfString);
- int newPosition = position + partOfString.length();
+ int newPosition = position + partOfString.length();
- // sets cursor position
- part.getSourceEditor().getTextViewer().getTextWidget().setCaretOffset(
- newPosition);
-
- TestUtil.waitForJobs();
- TestUtil.delay(1000);
- SourceViewerConfiguration sourceViewerConfiguration = ((JSPTextEditor) part
- .getSourceEditor()).getSourceViewerConfigurationForTest();
- // errase errors which can be on start of editor(for example xuklunner
- // not found)
- setException(null);
- StructuredTextViewerConfiguration stvc = (StructuredTextViewerConfiguration) sourceViewerConfiguration;
- IContentAssistant iContentAssistant = stvc
- .getContentAssistant((ISourceViewer) part.getSourceEditor()
- .getAdapter(ISourceViewer.class));
- assertNotNull(iContentAssistant);
- IContentAssistProcessor iContentAssistProcessor = iContentAssistant
- .getContentAssistProcessor(caName);
- assertNotNull(iContentAssistProcessor);
- ICompletionProposal[] results = iContentAssistProcessor
- .computeCompletionProposals(part.getSourceEditor()
- .getTextViewer(), newPosition);
+ // sets cursor position
+ part.getSourceEditor().getTextViewer().getTextWidget().setCaretOffset(
+ newPosition);
+
+ TestUtil.waitForJobs();
+ TestUtil.delay(1000);
+ SourceViewerConfiguration sourceViewerConfiguration = ((JSPTextEditor) part
+ .getSourceEditor()).getSourceViewerConfigurationForTest();
+ // errase errors which can be on start of editor(for example xuklunner
+ // not found)
+ setException(null);
+ StructuredTextViewerConfiguration stvc = (StructuredTextViewerConfiguration) sourceViewerConfiguration;
+ IContentAssistant iContentAssistant = stvc
+ .getContentAssistant((ISourceViewer) part.getSourceEditor()
+ .getAdapter(ISourceViewer.class));
+ assertNotNull(iContentAssistant);
+ IContentAssistProcessor iContentAssistProcessor = iContentAssistant
+ .getContentAssistProcessor(caName);
+ assertNotNull(iContentAssistProcessor);
+ results = iContentAssistProcessor
+ .computeCompletionProposals(part.getSourceEditor()
+ .getTextViewer(), newPosition);
- // remove inserted string
- part.getSourceEditor().getTextViewer().getTextWidget()
- .replaceTextRange(position, partOfString.length(), ""); //$NON-NLS-1$
- assertNotNull(results);
- assertTrue("Number of ca proposals shouldn't be a null",results.length>0); //$NON-NLS-1$
- if (isCheck) {
- for (int i = 0; i < results.length; i++) {
+ // remove inserted string
+ part.getSourceEditor().getTextViewer().getTextWidget()
+ .replaceTextRange(position, partOfString.length(), ""); //$NON-NLS-1$
+ assertNotNull(results);
+ assertTrue("Number of ca proposals shouldn't be a null",results.length>0); //$NON-NLS-1$
+ if (isCheck) {
+ for (int i = 0; i < results.length; i++) {
- String displayString = ((ICompletionProposal) results[i]).getDisplayString();
- assertNotNull(displayString);
- assertEquals(true, displayString.startsWith(partOfString));
- }
- }
+ String displayString = ((ICompletionProposal) results[i]).getDisplayString();
+ assertNotNull(displayString);
+ assertEquals(true, displayString.startsWith(partOfString));
+ }
+ }
+ } finally {
+ closeEditors();
+ TestUtil.delay(1000L);
+ }
- closeEditors();
- TestUtil.delay(1000L);
return results;
}
}
16 years, 2 months
JBoss Tools SVN: r11126 - branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-10-23 18:06:37 -0400 (Thu, 23 Oct 2008)
New Revision: 11126
Modified:
branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java
Log:
Fixing errors in the org.jboss.tools.jsf.vpe.jsf.test tests
Modified: branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java 2008-10-23 20:11:13 UTC (rev 11125)
+++ branches/jbosstools-3.0.0.Beta1/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/jspeditor/SourceEditorPageContext.java 2008-10-23 22:06:37 UTC (rev 11126)
@@ -71,6 +71,7 @@
clearAll();
setConnector(null);
setReferenceNode(null);
+ setPageContext(null);
}
/**
16 years, 2 months
JBoss Tools SVN: r11125 - in branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-23 16:11:13 -0400 (Thu, 23 Oct 2008)
New Revision: 11125
Modified:
branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF
branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml
Log:
fix plugin ide and path to icon
Modified: branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF 2008-10-23 20:09:27 UTC (rev 11124)
+++ branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF 2008-10-23 20:11:13 UTC (rev 11125)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.jboss.tools.jbpm.convert.bpmnto;singleton:=true
+Bundle-SymbolicName: org.jboss.tools.jbpm.convert;singleton:=true
Bundle-Version: 1.0.0
Bundle-Localization: plugin
Bundle-Activator: org.jboss.tools.jbpm.convert.bpmnto.BpmnToPlugin
Modified: branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml
===================================================================
--- branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml 2008-10-23 20:09:27 UTC (rev 11124)
+++ branches/jbosstools-3.0.0.Beta1/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml 2008-10-23 20:11:13 UTC (rev 11125)
@@ -5,7 +5,7 @@
<category name="%category.name"
id="org.jboss.tools.jbpm.convert.export.category"/>
<wizard name="%wizard.name"
- icon="icons/sample.gif"
+ icon="$nl$/icons/sample.gif"
category="org.jboss.tools.jbpm.convert.export.category"
class="org.jboss.tools.jbpm.convert.b2j.wizard.B2JExportWizard"
id="org.jboss.tools.jbpm.convert.export.b2jexportwizard">
16 years, 2 months
JBoss Tools SVN: r11124 - branches/jbosstools-3.0.0.Beta1/jbpm/features.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-23 16:09:27 -0400 (Thu, 23 Oct 2008)
New Revision: 11124
Added:
branches/jbosstools-3.0.0.Beta1/jbpm/features/org.jboss.tools.jbpm.convert.feature/
Log:
branch for ibpm-convert feature
Copied: branches/jbosstools-3.0.0.Beta1/jbpm/features/org.jboss.tools.jbpm.convert.feature (from rev 11123, trunk/jbpm/features/org.jboss.tools.jbpm.convert.feature)
16 years, 2 months
JBoss Tools SVN: r11122 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context.
by jbosstools-commits＠lists.jboss.org
Author: vrubezhny
Date: 2008-10-23 15:55:56 -0400 (Thu, 23 Oct 2008)
New Revision: 11122
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2980 CA is broken with java.lang.NullPointerException.
fixed
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2008-10-23 19:51:17 UTC (rev 11121)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/context/VpePageContext.java 2008-10-23 19:55:56 UTC (rev 11122)
@@ -219,6 +219,9 @@
}
public List<TaglibData> getIncludeTaglibs() {
+ if (getEditPart() == null) {
+ return new ArrayList<TaglibData>();
+ }
IEditorInput input = getEditPart().getEditorInput();
IFile file = null;
if (input instanceof IFileEditorInput) {
16 years, 2 months
JBoss Tools SVN: r11121 - branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-10-23 15:51:17 -0400 (Thu, 23 Oct 2008)
New Revision: 11121
Modified:
branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
Log:
change some view IDs so they do not conflict with actual eclipse id's.
Modified: branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java
===================================================================
--- branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2008-10-23 19:22:34 UTC (rev 11120)
+++ branches/jbosstools-3.0.0.Beta1/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 2008-10-23 19:51:17 UTC (rev 11121)
@@ -67,7 +67,7 @@
if( !prefs.getBoolean(IPreferenceKeys.ENABLED_DECORATORS)) {
IDecoratorManager manager = WorkbenchPlugin.getDefault().getDecoratorManager();
- manager.setEnabled("org.eclipse.wst.server.ui.navigatorDecorator", true);
+ manager.setEnabled("org.jboss.tools.wst.server.ui.navigatorDecorator", true);
manager.setEnabled("org.jboss.ide.eclipse.as.ui.extensions.xml.decorator", true);
prefs.setValue(IPreferenceKeys.ENABLED_DECORATORS, true);
savePluginPreferences();
16 years, 2 months
JBoss Tools SVN: r11120 - trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-23 15:22:34 -0400 (Thu, 23 Oct 2008)
New Revision: 11120
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF
Log:
version removed frorm dependency to common plugin
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF 2008-10-23 18:50:05 UTC (rev 11119)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF 2008-10-23 19:22:34 UTC (rev 11120)
@@ -7,7 +7,7 @@
Bundle-Activator: org.jboss.tools.jbpm.convert.bpmnto.BpmnToPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.jboss.tools.common;bundle-version="2.0.0"
+ org.jboss.tools.common
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .,
16 years, 2 months
JBoss Tools SVN: r11119 - in trunk/jbpm/plugins/org.jboss.tools.jbpm.convert: META-INF and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-10-23 14:50:05 -0400 (Thu, 23 Oct 2008)
New Revision: 11119
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/build.properties
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-2947. Plugin ID has been changed to be the same as project and folder name
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF 2008-10-23 18:48:43 UTC (rev 11118)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/META-INF/MANIFEST.MF 2008-10-23 18:50:05 UTC (rev 11119)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.jboss.tools.jbpm.convert.bpmnto;singleton:=true
+Bundle-SymbolicName: org.jboss.tools.jbpm.convert;singleton:=true
Bundle-Version: 1.0.0
Bundle-Localization: plugin
Bundle-Activator: org.jboss.tools.jbpm.convert.bpmnto.BpmnToPlugin
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/build.properties
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/build.properties 2008-10-23 18:48:43 UTC (rev 11118)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/build.properties 2008-10-23 18:50:05 UTC (rev 11119)
@@ -4,4 +4,5 @@
.,\
plugin.xml,\
plugin.properties,\
- lib/dom4j-1.6.1.jar
+ lib/dom4j-1.6.1.jar,\
+ icons/
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml 2008-10-23 18:48:43 UTC (rev 11118)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml 2008-10-23 18:50:05 UTC (rev 11119)
@@ -5,7 +5,7 @@
<category name="%category.name"
id="org.jboss.tools.jbpm.convert.export.category"/>
<wizard name="%wizard.name"
- icon="icons/sample.gif"
+ icon="$nl$/icons/sample.gif"
category="org.jboss.tools.jbpm.convert.export.category"
class="org.jboss.tools.jbpm.convert.b2j.wizard.B2JExportWizard"
id="org.jboss.tools.jbpm.convert.export.b2jexportwizard">
16 years, 2 months