JBoss Tools SVN: r7844 - in trunk/jsf/docs: userguide/en/images/editors_features and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: tromanovich
Date: 2008-04-28 05:16:50 -0400 (Mon, 28 Apr 2008)
New Revision: 7844
Modified:
trunk/jsf/docs/jsf_tools_ref_guide/en/images/jsf_support/jsf_support_27.png
trunk/jsf/docs/jsf_tools_ref_guide/en/images/jsf_support/jsf_support_28.png
trunk/jsf/docs/jsf_tools_ref_guide/en/images/jsf_support/jsf_support_29.png
trunk/jsf/docs/jsf_tools_ref_guide/en/images/jsf_support/jsf_support_30.png
trunk/jsf/docs/jsf_tools_ref_guide/en/images/jsf_support/jsf_support_31.png
trunk/jsf/docs/jsf_tools_ref_guide/en/images/jsf_support/jsf_support_32.png
trunk/jsf/docs/jsf_tools_ref_guide/en/images/jsf_support/jsf_support_40.png
trunk/jsf/docs/jsf_tools_ref_guide/en/images/jsf_support/jsf_support_5.png
trunk/jsf/docs/jsf_tools_ref_guide/en/images/jsf_support/jsf_support_9.png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_21.png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_23.png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_24.png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_25.png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_26.png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_27.png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_29.png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_30.png
trunk/jsf/docs/userguide/en/images/editors_features/editors_features_31.png
trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_1.png
trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_27.png
trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_28.png
trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_29.png
trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_30.png
trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_31.png
trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_32.png
trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_40.png
trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_5.png
trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_9.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_46.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_53.png
trunk/jsf/docs/userguide/en/images/more_editors/more_editors_8.png
trunk/jsf/docs/userguide/en/images/struts/struts_38.png
Log:
http://jira.jboss.com/jira/browse/JBDS-226 -
Screeshots resolution. screenshots update
JSF folder
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en/images/jsf_support/jsf_support_27.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en/images/jsf_support/jsf_support_28.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en/images/jsf_support/jsf_support_29.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en/images/jsf_support/jsf_support_30.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en/images/jsf_support/jsf_support_31.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en/images/jsf_support/jsf_support_32.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en/images/jsf_support/jsf_support_40.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en/images/jsf_support/jsf_support_5.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/jsf_tools_ref_guide/en/images/jsf_support/jsf_support_9.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_21.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_23.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_24.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_25.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_26.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_27.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_29.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_30.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/editors_features/editors_features_31.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_1.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_27.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_28.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_29.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_30.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_31.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_32.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_40.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_5.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/jsf_support/jsf_support_9.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_46.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_53.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/more_editors/more_editors_8.png
===================================================================
(Binary files differ)
Modified: trunk/jsf/docs/userguide/en/images/struts/struts_38.png
===================================================================
(Binary files differ)
16 years
JBoss Tools SVN: r7843 - in trunk/seam/docs/reference/en/images: directory_structure and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: tromanovich
Date: 2008-04-28 04:52:28 -0400 (Mon, 28 Apr 2008)
New Revision: 7843
Modified:
trunk/seam/docs/reference/en/images/business_application/business_application_2.png
trunk/seam/docs/reference/en/images/business_application/business_application_4.png
trunk/seam/docs/reference/en/images/directory_structure/directory_structure_1.png
trunk/seam/docs/reference/en/images/directory_structure/directory_structure_2.png
trunk/seam/docs/reference/en/images/seam_menus_and_actions/menus_and_actions3.png
trunk/seam/docs/reference/en/images/seam_wizards/seam_wizards_16.png
trunk/seam/docs/reference/en/images/seam_wizards/seam_wizards_9.png
Log:
http://jira.jboss.com/jira/browse/JBDS-226 - Screeshots resolution. screenshots update
Updating screens for Seam project
Modified: trunk/seam/docs/reference/en/images/business_application/business_application_2.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/business_application/business_application_4.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/directory_structure/directory_structure_1.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/directory_structure/directory_structure_2.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/seam_menus_and_actions/menus_and_actions3.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/seam_wizards/seam_wizards_16.png
===================================================================
(Binary files differ)
Modified: trunk/seam/docs/reference/en/images/seam_wizards/seam_wizards_9.png
===================================================================
(Binary files differ)
16 years
JBoss Tools SVN: r7842 - trunk/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-04-27 20:40:06 -0400 (Sun, 27 Apr 2008)
New Revision: 7842
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java
Log:
JBIDE-2128 - removing unused imports
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java 2008-04-27 21:07:02 UTC (rev 7841)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java 2008-04-28 00:40:06 UTC (rev 7842)
@@ -11,15 +11,9 @@
package org.jboss.tools.jsf.vpe.jsf.test.jbide;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.swt.custom.StyledText;
import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.progress.UIJob;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.vpe.ui.test.TestUtil;
import org.jboss.tools.vpe.ui.test.VpeTest;
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java 2008-04-27 21:07:02 UTC (rev 7841)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java 2008-04-28 00:40:06 UTC (rev 7842)
@@ -16,9 +16,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.swt.custom.StyledTextContent;
import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
16 years
JBoss Tools SVN: r7841 - in trunk: vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-04-27 17:07:02 -0400 (Sun, 27 Apr 2008)
New Revision: 7841
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java
Log:
JBIDE-2128 Error when executing the testCAforIncludeTaglibInInenerNodes VPE JUnit test
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java 2008-04-27 20:50:20 UTC (rev 7840)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1105Test.java 2008-04-27 21:07:02 UTC (rev 7841)
@@ -52,41 +52,32 @@
assertNotNull("Editor input is null", input);
- TestUtil.waitForJobs();
final JSPMultiPageEditor parts = openEditor(input);
- TestUtil.delay(1000L);
+ TestUtil.waitForIdle();
assertNotNull(parts);
- Job job = new UIJob("Test JBIDE-1105") {
- @Override
- public IStatus runInUIThread(IProgressMonitor monitor) {
- StyledText styledText = parts.getSourceEditor().getTextViewer()
+ StyledText styledText = parts.getSourceEditor().getTextViewer()
.getTextWidget();
- String delimiter = styledText.getLineDelimiter();
- for (int i = 0; i < 200; i++) {
- int offset = styledText.getOffsetAtLine(21);
- styledText.setCaretOffset(offset - delimiter.length());
- styledText.insert(delimiter);
- TestUtil.delay(50L);
- }
- for (int i = 0; i < 200; i++) {
- int offset = styledText.getOffsetAtLine(23);
- styledText.setCaretOffset(offset - " Test ".length() - delimiter.length());
- styledText.insert(" Test ");
- TestUtil.delay(50L);
- }
- return Status.OK_STATUS;
- }
-
- };
- job.setPriority(Job.SHORT);
- job.schedule(0L);
+ String delimiter = styledText.getLineDelimiter();
+ for (int i = 0; i < 200; i++) {
+ int offset = styledText.getOffsetAtLine(21);
+ styledText.setCaretOffset(offset - delimiter.length());
+ styledText.insert(delimiter);
+ TestUtil.waitForIdle();
+ }
+ for (int i = 0; i < 200; i++) {
+ int offset = styledText.getOffsetAtLine(23);
+ styledText.setCaretOffset(offset - " Test ".length()
+ - delimiter.length());
+ styledText.insert(" Test ");
+ TestUtil.waitForIdle();
+ }
+
+ TestUtil.waitForIdle();
TestUtil.delay(1000L);
- TestUtil.waitForJobs();
-
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .closeAllEditors(false);
-
+
+ closeEditors();
+
if (getException() != null) {
throw getException();
}
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java 2008-04-27 20:50:20 UTC (rev 7840)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE1479Test.java 2008-04-27 21:07:02 UTC (rev 7841)
@@ -37,15 +37,12 @@
public static final String TEST_PAGE_NAME = "JBIDE/1479/employee.xhtml"; //$NON-NLS-1$
- private boolean finished;
-
public JBIDE1479Test(String name) {
super(name);
}
public void testJBIDE1479() throws Throwable {
// wait
- TestUtil.waitForJobs();
setException(null);
// get test page path
final IFile file = (IFile) TestUtil.getComponentPath(
@@ -60,14 +57,10 @@
assertNotNull("Editor input is null", input); //$NON-NLS-1$
- TestUtil.waitForJobs();
JSPMultiPageEditor part = openEditor(input);
- TestUtil.delay(10000L);
+ TestUtil.waitForIdle();
assertNotNull(part);
- final StyledTextContent content= part.getSourceEditor().getTextViewer().getTextWidget().getContent();
- finished = false;
-
Job job = new WorkspaceJob("Test JBIDE-1479"){ //$NON-NLS-1$
public IStatus runInWorkspace(IProgressMonitor monitor) {
@@ -79,21 +72,16 @@
* exception, so we just ignore it's.
*/
}
- finished = true;
return Status.OK_STATUS;
}
};
job.setPriority(Job.SHORT);
job.schedule(0L);
- TestUtil.delay(15000L);
- TestUtil.waitForJobs();
-
- while (!finished) {
- TestUtil.delay(1000L);
- }
-
- PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
- .closeAllEditors(false);
+ job.join();
+ TestUtil.waitForIdle();
+ TestUtil.delay(1000L);
+ closeEditors();
+
/*
* we ignore this code, because we are testint JBIDE-1479,
* it's test fot crash of eclipse.And if we modifying content from non-ui thread, we almost
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-04-27 20:50:20 UTC (rev 7840)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2008-04-27 21:07:02 UTC (rev 7841)
@@ -20,7 +20,6 @@
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.part.FileEditorInput;
import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
import org.jboss.tools.jst.jsp.jspeditor.JSPTextEditor;
import org.jboss.tools.vpe.ui.test.TestUtil;
@@ -259,6 +258,9 @@
.getTextViewer(), position);
assertNotNull(results);
assertEquals(numberOfProposals, results.length);
+
+ closeEditors();
+ TestUtil.delay(1000L);
}
/**
@@ -329,6 +331,8 @@
assertEquals(true, displayString.startsWith(partOfString));
}
+ closeEditors();
+ TestUtil.delay(1000L);
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-04-27 20:50:20 UTC (rev 7840)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-04-27 21:07:02 UTC (rev 7841)
@@ -315,6 +315,10 @@
}
public void dispose() {
+ if (job != null) {
+ job.cancel();
+ job = null;
+ }
if (optionsListener != null) {
XModelObject optionsObject = ModelUtilities.getPreferenceModel()
.getByPath(VpePreference.EDITOR_PATH);
@@ -436,7 +440,7 @@
public void notifyChangedInUiThread(INodeNotifier notifier, int eventType,
Object feature, Object oldValue, Object newValue, int pos) {
- if (!switcher
+ if (switcher == null || !switcher
.startActiveEditor(ActiveEditorSwitcher.ACTIVE_EDITOR_SOURCE)) {
return;
}
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2008-04-27 20:50:20 UTC (rev 7840)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/TestUtil.java 2008-04-27 21:07:02 UTC (rev 7841)
@@ -42,6 +42,8 @@
private static final String WEBCONTENT_PATH = "WebContent"; //$NON-NLS-1$
+ private static final long MAX_IDLE = 30*60*1000L;
+
@SuppressWarnings("restriction")
static void importProjectIntoWorkspace(String path, String projectName) {
@@ -163,6 +165,15 @@
while (Job.getJobManager().currentJob() != null)
delay(100);
}
+
+ public static void waitForIdle() {
+ long start = System.currentTimeMillis();
+ while (!Job.getJobManager().isIdle()) {
+ delay(500);
+ if ( (System.currentTimeMillis()-start) > MAX_IDLE )
+ throw new RuntimeException("A long running task detected");
+ }
+ }
/**
* find elements by name
16 years
JBoss Tools SVN: r7840 - in branches/ganymede/trunk: hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-04-27 16:50:20 -0400 (Sun, 27 Apr 2008)
New Revision: 7840
Modified:
branches/ganymede/trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLEditorConfiguration.java
branches/ganymede/trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/HBMXMLHyperlink.java
Log:
[JBIDE-2156] [Ganymede] EditorUtility.openInEditor stopped throwing JavaModelException
Modified: branches/ganymede/trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLEditorConfiguration.java
===================================================================
--- branches/ganymede/trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLEditorConfiguration.java 2008-04-27 19:11:00 UTC (rev 7839)
+++ branches/ganymede/trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/editors/ServiceXMLEditorConfiguration.java 2008-04-27 20:50:20 UTC (rev 7840)
@@ -687,10 +687,7 @@
} catch (PartInitException e) {
IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Unable to display element in editor.", e);
Activator.getDefault().getLog().log(status);
- } catch( JavaModelException e ) {
- IStatus status = new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Unable to display element in editor.", e);
- Activator.getDefault().getLog().log(status);
- }
+ }
}
}
Modified: branches/ganymede/trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/HBMXMLHyperlink.java
===================================================================
--- branches/ganymede/trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/HBMXMLHyperlink.java 2008-04-27 19:11:00 UTC (rev 7839)
+++ branches/ganymede/trunk/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/HBMXMLHyperlink.java 2008-04-27 20:50:20 UTC (rev 7840)
@@ -58,9 +58,6 @@
if(part!=null) {
EditorUtility.revealInEditor(part, element);
}
- } catch (JavaModelException e) {
- // ignore...TODO?
- e.printStackTrace();
} catch (PartInitException e) {
// TODO Auto-generated catch block
e.printStackTrace();
16 years
JBoss Tools SVN: r7839 - branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/launching/sourcelookup.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-04-27 15:11:00 -0400 (Sun, 27 Apr 2008)
New Revision: 7839
Modified:
branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/launching/sourcelookup/WebServerSourceLocator.java
Log:
[JBIDE-2155] [Ganymede] JavaSourceLocator started throwing CoreException instead of JavaModelException
Modified: branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/launching/sourcelookup/WebServerSourceLocator.java
===================================================================
--- branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/launching/sourcelookup/WebServerSourceLocator.java 2008-04-27 18:43:13 UTC (rev 7838)
+++ branches/ganymede/trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/launching/sourcelookup/WebServerSourceLocator.java 2008-04-27 19:11:00 UTC (rev 7839)
@@ -13,6 +13,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.model.IBreakpoint;
import org.eclipse.debug.core.model.IStackFrame;
import org.eclipse.jdt.core.IJavaProject;
@@ -29,7 +30,7 @@
*/
public class WebServerSourceLocator extends JavaSourceLocator {
- public WebServerSourceLocator(IJavaProject[] projects, boolean includeRequired) throws JavaModelException {
+ public WebServerSourceLocator(IJavaProject[] projects, boolean includeRequired) throws CoreException {
super(projects, includeRequired);
}
16 years
JBoss Tools SVN: r7838 - branches/ganymede/trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-04-27 14:43:13 -0400 (Sun, 27 Apr 2008)
New Revision: 7838
Modified:
branches/ganymede/trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java
Log:
[JBIDE-2154] [Ganymede] The type * must implement the inherited abstract method ILaunchConfiguration.hasAttribute(String)/removeAttribute
Modified: branches/ganymede/trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java
===================================================================
--- branches/ganymede/trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java 2008-04-27 18:37:21 UTC (rev 7837)
+++ branches/ganymede/trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/RefactoringTest.java 2008-04-27 18:43:13 UTC (rev 7838)
@@ -285,6 +285,18 @@
return parent;
}
+ @Override
+ public boolean hasAttribute(String attributeName)
+ throws CoreException {
+ fail("Method doesn't tested");
+ return false;
+ }
+
+ @Override
+ public Object removeAttribute(String attributeName) {
+ fail("Method doesn't tested");
+ return null;
+ }
public ILaunchConfiguration getOriginal() {
return parent;
}
@@ -506,6 +518,12 @@
}
}
+ @Override
+ public boolean hasAttribute(String attributeName)
+ throws CoreException {
+ return attributes.containsKey(attributeName);
+ }
+
public int getAttribute(String attributeName, int defaultValue)
throws CoreException {
if (attributes.containsKey(attributeName)){
@@ -630,7 +648,10 @@
public Object getAdapter(Class adapter) {
return null;
- }};
+ }
+
+
+ };
}
16 years
JBoss Tools SVN: r7837 - branches/ganymede/trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-04-27 14:37:21 -0400 (Sun, 27 Apr 2008)
New Revision: 7837
Modified:
branches/ganymede/trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/SaveQueryEditorListener.java
Log:
[JBIDE-2153] [Ganymede] The method activate(RefactoringWizard, Shell, String, int) in the type RefactoringStarter is not applicable for the arguments (Refactoring, RefactoringWizard, Shell, String, int)
Modified: branches/ganymede/trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/SaveQueryEditorListener.java
===================================================================
--- branches/ganymede/trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/SaveQueryEditorListener.java 2008-04-27 07:50:42 UTC (rev 7836)
+++ branches/ganymede/trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/SaveQueryEditorListener.java 2008-04-27 18:37:21 UTC (rev 7837)
@@ -193,19 +193,15 @@
wizard.setDefaultPageTitle(wizard_title);
IWorkbenchWindow win = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
- try {
- if ( new RefactoringStarter().activate(ref, wizard, win.getShell(), wizard_title, RefactoringSaveHelper.SAVE_ALL)){ //$NON-NLS-1$
- query = newQuery;
- position.y = query.length();
- fromEditorPart.doSave(null);
- } else {
- if (editor.getDocumentProvider() instanceof TextFileDocumentProvider){
- ((TextFileDocumentProvider)editor.getDocumentProvider()).setCanSaveDocument(editor.getEditorInput());
- }
- }
- } catch (JavaModelException e) {
- HibernateConsolePlugin.getDefault().log(e);
- }
+ if ( new RefactoringStarter().activate(wizard, win.getShell(), wizard_title, RefactoringSaveHelper.SAVE_ALL)){ //$NON-NLS-1$
+ query = newQuery;
+ position.y = query.length();
+ fromEditorPart.doSave(null);
+ } else {
+ if (editor.getDocumentProvider() instanceof TextFileDocumentProvider){
+ ((TextFileDocumentProvider)editor.getDocumentProvider()).setCanSaveDocument(editor.getEditorInput());
+ }
+ }
}
}
16 years
JBoss Tools SVN: r7836 - branches/ganymede/trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-04-27 03:50:42 -0400 (Sun, 27 Apr 2008)
New Revision: 7836
Modified:
branches/ganymede/trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java
branches/ganymede/trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/MementoDOM.java
Log:
JBIDE-2152 [Ganymede]The type Memento must implement the inherited abstract method IMemento.*
Modified: branches/ganymede/trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java
===================================================================
--- branches/ganymede/trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java 2008-04-26 17:06:25 UTC (rev 7835)
+++ branches/ganymede/trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/Memento.java 2008-04-27 07:50:42 UTC (rev 7836)
@@ -36,14 +36,18 @@
private String id;
private HashMap map = new HashMap();
+ final private String type;
private static final String TEXT_DATA = "org.jboss.tools.common.model.ui.forms.Memento.textData.id";
- private Memento() {}
+ private Memento() {
+ type = null;
+ }
- public Memento(String id) {
+ public Memento(String type, String id) {
ModelUIPlugin.getPluginLog().logInfo("new Memento("+id+")");
this.id = id;
+ this.type = type;
}
/* (non-Javadoc)
@@ -57,7 +61,7 @@
* @see org.eclipse.ui.IMemento#createChild(java.lang.String, java.lang.String)
*/
public IMemento createChild(String type, String id) {
- Memento newMemento = new Memento(id);
+ Memento newMemento = new Memento(type, id);
ArrayList list = (ArrayList)map.get(type);
if (list==null) {
list = new ArrayList();
@@ -219,4 +223,24 @@
}
public void store(IResource resource) {
}
+
+ @Override
+ public String[] getAttributeKeys() {
+ return (String[]) map.keySet().toArray(new String[0]);
+ }
+
+ @Override
+ public Boolean getBoolean(String key) {
+ return (Boolean)map.get(key);
+ }
+
+ @Override
+ public void putBoolean(String key, boolean value) {
+ map.put(key, value);
+ }
+
+ @Override
+ public String getType() {
+ return type;
+ }
}
Modified: branches/ganymede/trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/MementoDOM.java
===================================================================
--- branches/ganymede/trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/MementoDOM.java 2008-04-26 17:06:25 UTC (rev 7835)
+++ branches/ganymede/trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/forms/MementoDOM.java 2008-04-27 07:50:42 UTC (rev 7836)
@@ -14,7 +14,9 @@
import java.util.Hashtable;
import org.eclipse.ui.IMemento;
+import org.w3c.dom.Attr;
import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
@@ -174,4 +176,38 @@
private Element getElement() {
return element;
}
+
+ @Override
+ public String[] getAttributeKeys() {
+ NamedNodeMap map = element.getAttributes();
+ int size = map.getLength();
+ String[] attributes = new String[size];
+ for (int i = 0; i < size; i++) {
+ Node node = map.item(i);
+ attributes[i] = node.getNodeName();
+ }
+ return attributes;
+
+ }
+
+ @Override
+ public Boolean getBoolean(String key) {
+ String attr = getString(key);
+ if (attr == null) {
+ return null;
+ }
+ return Boolean.valueOf(attr);
+ }
+
+ @Override
+ public void putBoolean(String key, boolean value) {
+ putString(key, value ? "true" : "false"); //$NON-NLS-1$ //$NON-NLS-2$
+ }
+
+ @Override
+ public String getType() {
+ return getString(TYPE);
+ }
+
+
}
16 years
JBoss Tools SVN: r7835 - branches/ganymede/trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2008-04-26 13:06:25 -0400 (Sat, 26 Apr 2008)
New Revision: 7835
Modified:
branches/ganymede/trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/ProjectWizard.java
branches/ganymede/trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/ProjectWizardPage.java
Log:
JBIDE-2151 [Ganymede] NewWizardMessages.JavaProjectWizard* cannot be resolved
Modified: branches/ganymede/trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/ProjectWizard.java
===================================================================
--- branches/ganymede/trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/ProjectWizard.java 2008-04-26 16:57:47 UTC (rev 7834)
+++ branches/ganymede/trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/ProjectWizard.java 2008-04-26 17:06:25 UTC (rev 7835)
@@ -67,8 +67,8 @@
{
super.addPages();
this.fMainPage = new WizardNewProjectCreationPage("NewProjectCreationWizard");//$NON-NLS-1$
- this.fMainPage.setTitle(NewWizardMessages.JavaProjectWizardFirstPage_page_title);//$NON-NLS-1$
- this.fMainPage.setDescription(NewWizardMessages.JavaProjectWizardFirstPage_page_description);//$NON-NLS-1$
+ this.fMainPage.setTitle(NewWizardMessages.NewJavaProjectWizardPageOne_page_title);//$NON-NLS-1$
+ this.fMainPage.setDescription(NewWizardMessages.NewJavaProjectWizardPageOne_page_description);//$NON-NLS-1$
this.addPage(fMainPage);
this.fJavaPage = this.createProjectWizardPage(fMainPage);
Modified: branches/ganymede/trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/ProjectWizardPage.java
===================================================================
--- branches/ganymede/trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/ProjectWizardPage.java 2008-04-26 16:57:47 UTC (rev 7834)
+++ branches/ganymede/trunk/core/plugins/org.jboss.ide.eclipse.jdt.ui/src/main/org/jboss/ide/eclipse/jdt/ui/wizards/ProjectWizardPage.java 2008-04-26 17:06:25 UTC (rev 7835)
@@ -92,7 +92,7 @@
{
try
{
- monitor.beginTask(NewWizardMessages.JavaProjectWizardSecondPage_operation_create, 3);//$NON-NLS-1$
+ monitor.beginTask(NewWizardMessages.NewJavaProjectWizardPageTwo_operation_create, 3);//$NON-NLS-1$
if (fCurrProject == null)
{
this.updateProject(true, new SubProgressMonitor(monitor, 1));
@@ -201,7 +201,7 @@
{
monitor = new NullProgressMonitor();
}
- monitor.beginTask(NewWizardMessages.JavaProjectWizardSecondPage_operation_remove, 3);//$NON-NLS-1$
+ monitor.beginTask(NewWizardMessages.NewJavaProjectWizardPageTwo_operation_remove, 3);//$NON-NLS-1$
try
{
@@ -226,8 +226,8 @@
}
catch (InvocationTargetException e)
{
- String title = NewWizardMessages.JavaProjectWizardSecondPage_error_remove_title;//$NON-NLS-1$
- String message = NewWizardMessages.JavaProjectWizardSecondPage_error_remove_message;//$NON-NLS-1$
+ String title = NewWizardMessages.NewJavaProjectWizardPageTwo_error_remove_title;//$NON-NLS-1$
+ String message = NewWizardMessages.NewJavaProjectWizardPageTwo_error_remove_message;//$NON-NLS-1$
ExceptionHandler.handle(e, getShell(), title, message);
}
catch (InterruptedException e)
@@ -257,7 +257,7 @@
}
try
{
- monitor.beginTask(NewWizardMessages.JavaProjectWizardSecondPage_operation_initialize, 2);//$NON-NLS-1$
+ monitor.beginTask(NewWizardMessages.NewJavaProjectWizardPageTwo_operation_initialize, 2);//$NON-NLS-1$
createProject(fCurrProject, fCurrProjectLocation, new SubProgressMonitor(monitor, 1));
16 years, 1 month