JBoss Tools SVN: r13894 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog.
by jbosstools-commits@lists.jboss.org
Author: sdzmitrovich
Date: 2009-02-27 12:52:07 -0500 (Fri, 27 Feb 2009)
New Revision: 13894
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3869
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2009-02-27 17:37:13 UTC (rev 13893)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2009-02-27 17:52:07 UTC (rev 13894)
@@ -600,12 +600,13 @@
// if new css was added
if (classCombo.indexOf(currentClassStyle) == -1) {
- applyButton.setEnabled(true);
classCombo.add(currentClassStyle);
- styleChanged = true;
- } else {
+// styleChanged = true;
+ } /*else {
styleChanged = false;
- }
+ }*/
+ applyButton.setEnabled(true);
+ styleChanged = true;
updateStyleComposite();
styleAttributes.setCssSelector(currentClassStyle);
15 years, 10 months
JBoss Tools SVN: r13893 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog.
by jbosstools-commits@lists.jboss.org
Author: sdzmitrovich
Date: 2009-02-27 12:37:13 -0500 (Fri, 27 Feb 2009)
New Revision: 13893
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3869
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2009-02-27 17:29:37 UTC (rev 13892)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2009-02-27 17:37:13 UTC (rev 13893)
@@ -584,7 +584,7 @@
// if (classCombo.indexOf(currentClassStyle) == -1) {
// classCombo.add(currentClassStyle);
// }
-// saveChanges(false);
+ cssModel.setCSS(currentClassStyle, styleAttributes);
// // update content assist proposals
// SimpleContentProposalProvider proposalProvider =
// (SimpleContentProposalProvider)contentAssistAdapter.getContentProposalProvider();
15 years, 10 months
JBoss Tools SVN: r13892 - trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog.
by jbosstools-commits@lists.jboss.org
Author: sdzmitrovich
Date: 2009-02-27 12:29:37 -0500 (Fri, 27 Feb 2009)
New Revision: 13892
Modified:
trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3869
Modified: trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java
===================================================================
--- trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2009-02-27 17:25:46 UTC (rev 13891)
+++ trunk/jst/plugins/org.jboss.tools.jst.jsp/src/org/jboss/tools/jst/jsp/outline/cssdialog/CSSClassDialog.java 2009-02-27 17:29:37 UTC (rev 13892)
@@ -574,27 +574,27 @@
*/
private void cssStyleClassChanged() {
if (currentFile != null && !currentFile.equals(Constants.EMPTY)) {
- if (styleChanged && currentClassStyle != null && !currentClassStyle.equals(Constants.EMPTY)) {
- MessageBox messageBox = new MessageBox(getParentShell(), SWT.YES | SWT.NO | SWT.ICON_QUESTION);
- messageBox.setText(JstUIMessages.CSS_SAVE_DIALOG_TITLE);
- messageBox.setMessage(CSSClassDialog.getMessageForSaveDialog(currentFile));
- int result = messageBox.open();
- if (result == SWT.YES) {
- // update ComboBox element list
- if (classCombo.indexOf(currentClassStyle) == -1) {
- classCombo.add(currentClassStyle);
- }
- saveChanges(false);
- // update content assist proposals
- SimpleContentProposalProvider proposalProvider =
- (SimpleContentProposalProvider)contentAssistAdapter.getContentProposalProvider();
- proposalProvider.setProposals(classCombo.getItems());
- } else {
- // FOR https://jira.jboss.org/jira/browse/JBIDE-3542
- // cssModel.init(currentFile);
- // styleComposite.revertPreview();
- }
- }
+// if (styleChanged && currentClassStyle != null && !currentClassStyle.equals(Constants.EMPTY)) {
+// MessageBox messageBox = new MessageBox(getParentShell(), SWT.YES | SWT.NO | SWT.ICON_QUESTION);
+// messageBox.setText(JstUIMessages.CSS_SAVE_DIALOG_TITLE);
+// messageBox.setMessage(CSSClassDialog.getMessageForSaveDialog(currentFile));
+// int result = messageBox.open();
+// if (result == SWT.YES) {
+// // update ComboBox element list
+// if (classCombo.indexOf(currentClassStyle) == -1) {
+// classCombo.add(currentClassStyle);
+// }
+// saveChanges(false);
+// // update content assist proposals
+// SimpleContentProposalProvider proposalProvider =
+// (SimpleContentProposalProvider)contentAssistAdapter.getContentProposalProvider();
+// proposalProvider.setProposals(classCombo.getItems());
+// } else {
+// // FOR https://jira.jboss.org/jira/browse/JBIDE-3542
+// // cssModel.init(currentFile);
+// // styleComposite.revertPreview();
+// }
+// }
// update current class style value
currentClassStyle = classCombo.getText().trim();
15 years, 10 months
JBoss Tools SVN: r13891 - trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink.
by jbosstools-commits@lists.jboss.org
Author: vrubezhny
Date: 2009-02-27 12:25:46 -0500 (Fri, 27 Feb 2009)
New Revision: 13891
Modified:
trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java
Log:
JBIDE-3886 java.lang.NullPointerException when use OpenOn feature in faces-config.xml from jars opened with JBoss Tools XML Editor.
Issue is fixed
Modified: trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2009-02-27 16:21:15 UTC (rev 13890)
+++ trunk/common/plugins/org.jboss.tools.common.text.ext/src/org/jboss/tools/common/text/ext/hyperlink/AbstractHyperlink.java 2009-02-27 17:25:46 UTC (rev 13891)
@@ -117,7 +117,7 @@
IPath path = new Path(wsRelativePath);
IResource r = ModelPlugin.getWorkspace().getRoot().findMember(
path);
- if (r.exists() && r instanceof IFile)
+ if (r != null && r.exists() && r instanceof IFile)
return (IFile) r;
}
String path = Platform.getLocation().append(wsRelativePath)
15 years, 10 months
JBoss Tools SVN: r13890 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation.
by jbosstools-commits@lists.jboss.org
Author: akazakov
Date: 2009-02-27 11:21:15 -0500 (Fri, 27 Feb 2009)
New Revision: 13890
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamProjectPropertyValidator.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3887 - Fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamProjectPropertyValidator.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamProjectPropertyValidator.java 2009-02-27 15:55:05 UTC (rev 13889)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/validation/SeamProjectPropertyValidator.java 2009-02-27 16:21:15 UTC (rev 13890)
@@ -91,6 +91,7 @@
}
}
+ finishValidating();
return OK_STATUS;
}
@@ -289,7 +290,7 @@
* @see org.eclipse.wst.validation.internal.provisional.core.IValidator#cleanup(org.eclipse.wst.validation.internal.provisional.core.IReporter)
*/
public void cleanup(IReporter reporter) {
- finishValidating();
+// finishValidating();
}
/* (non-Javadoc)
15 years, 10 months
JBoss Tools SVN: r13889 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca.
by jbosstools-commits@lists.jboss.org
Author: dazarov
Date: 2009-02-27 10:55:05 -0500 (Fri, 27 Feb 2009)
New Revision: 13889
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3701
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTest.java 2009-02-27 15:51:08 UTC (rev 13888)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/ca/SeamELContentAssistTest.java 2009-02-27 15:55:05 UTC (rev 13889)
@@ -10,6 +10,7 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.text.BadLocationException;
@@ -45,6 +46,10 @@
provider = new TestProjectProvider("org.jboss.tools.seam.ui.test", null, PROJECT_NAME, makeCopy);
project = provider.getProject();
project.refreshLocal(IResource.DEPTH_INFINITE, null);
+ JobUtils.waitForIdle();
+ //To ensure that the project is built.
+ project.build(IncrementalProjectBuilder.CLEAN_BUILD, new NullProgressMonitor());
+ JobUtils.waitForIdle();
}
protected void tearDown() throws Exception {
15 years, 10 months
JBoss Tools SVN: r13888 - in trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test: editor and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dmaliarevich
Date: 2009-02-27 10:51:08 -0500 (Fri, 27 Feb 2009)
New Revision: 13888
Added:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/CustomSashFormTest.java
Modified:
trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3793, test for sash changes according to JBIDE-3140 was added.
Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2009-02-27 10:10:51 UTC (rev 13887)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeUiTests.java 2009-02-27 15:51:08 UTC (rev 13888)
@@ -15,6 +15,7 @@
import org.jboss.tools.tests.ImportBean;
import org.jboss.tools.vpe.ui.test.dialog.VpeResourcesDialogTest;
+import org.jboss.tools.vpe.ui.test.editor.CustomSashFormTest;
import org.jboss.tools.vpe.ui.test.preferences.VpeEditorPreferencesPageTest;
import junit.framework.Test;
@@ -30,6 +31,7 @@
TestSuite suite = new TestSuite("UI Tests for vpe"); //$NON-NLS-1$
suite.addTestSuite(VpeResourcesDialogTest.class);
suite.addTestSuite(VpeEditorPreferencesPageTest.class);
+ suite.addTestSuite(CustomSashFormTest.class);
/*
* Add projects that will be used in junit tests.
Added: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/CustomSashFormTest.java
===================================================================
--- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/CustomSashFormTest.java (rev 0)
+++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/CustomSashFormTest.java 2009-02-27 15:51:08 UTC (rev 13888)
@@ -0,0 +1,92 @@
+package org.jboss.tools.vpe.ui.test.editor;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.internal.WorkbenchPage;
+import org.eclipse.ui.part.FileEditorInput;
+import org.jboss.tools.jst.jsp.editor.IVisualEditor;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.VpeEditorPart;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+import org.jboss.tools.vpe.ui.test.VpeUiTests;
+
+public class CustomSashFormTest extends VpeTest {
+
+ private final String FILE_NAME_ONE = "hello.jsp"; //$NON-NLS-1$
+ private final String FILE_NAME_TWO = "inputUserName.jsp"; //$NON-NLS-1$
+
+ public CustomSashFormTest(String name) {
+ super(name);
+ }
+
+ public void testSashChangesInJBIDE3140() throws Throwable {
+ IFile file1 = (IFile) TestUtil.getComponentPath(FILE_NAME_ONE,
+ VpeUiTests.IMPORT_PROJECT_NAME);
+ IFile file2 = (IFile) TestUtil.getComponentPath(FILE_NAME_TWO,
+ VpeUiTests.IMPORT_PROJECT_NAME);
+
+ /*
+ * Open file in the VPE
+ */
+ IEditorInput input = new FileEditorInput(file1);
+ JSPMultiPageEditor part = openEditor(input);
+ VpeEditorPart visualEditor = (VpeEditorPart) part.getVisualEditor();
+ /*
+ * Maximize visual part, switch to source part,
+ * close the file, open file again.
+ * Sash should be restored without any exception.
+ */
+ visualEditor.maximizeVisual();
+ visualEditor.setVisualMode(IVisualEditor.SOURCE_MODE);
+ TestUtil.waitForJobs();
+ /*
+ * Close editor part
+ */
+ ((WorkbenchPage)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()).getEditorPresentation().closeEditor(part);
+ TestUtil.waitForJobs();
+ TestUtil.delay(5000);
+ input = new FileEditorInput(file1);
+ part = openEditor(input);
+ visualEditor = (VpeEditorPart) part.getVisualEditor();
+ TestUtil.waitForJobs();
+ ((WorkbenchPage)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()).getEditorPresentation().closeEditor(part);
+
+ /*
+ * Test it on another file
+ */
+
+ /*
+ * Open file in the VPE
+ */
+ input = new FileEditorInput(file2);
+ part = openEditor(input);
+ visualEditor = (VpeEditorPart) part.getVisualEditor();
+
+ /*
+ * Maximize visual part, switch to source part,
+ * close the file, open file again.
+ * Sash should be restored without any exception.
+ */
+ visualEditor.maximizeVisual();
+ visualEditor.setVisualMode(IVisualEditor.SOURCE_MODE);
+ TestUtil.waitForJobs();
+ /*
+ * Close part without saving
+ */
+ ((WorkbenchPage)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()).getEditorPresentation().closeEditor(part);
+ TestUtil.waitForJobs();
+ part = openEditor(input);
+
+ /*
+ * If there are any exceptions it would be thrown.
+ */
+ TestUtil.waitForJobs();
+ if(getException()!=null) {
+ throw getException();
+ }
+
+ }
+
+}
Property changes on: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/editor/CustomSashFormTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
15 years, 10 months
JBoss Tools SVN: r13887 - tags/jbpm-jpdl-4.0.0.alpha2/flow/features.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-02-27 05:10:51 -0500 (Fri, 27 Feb 2009)
New Revision: 13887
Added:
tags/jbpm-jpdl-4.0.0.alpha2/flow/features/org.jboss.tools.flow.common.feature/
Log:
4.0.0.Alpha2 release
Copied: tags/jbpm-jpdl-4.0.0.alpha2/flow/features/org.jboss.tools.flow.common.feature (from rev 13886, trunk/flow/features/org.jboss.tools.flow.common.feature)
15 years, 10 months
JBoss Tools SVN: r13886 - tags/jbpm-jpdl-4.0.0.alpha2/flow/plugins.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-02-27 05:09:39 -0500 (Fri, 27 Feb 2009)
New Revision: 13886
Added:
tags/jbpm-jpdl-4.0.0.alpha2/flow/plugins/org.jboss.tools.flow.common/
Log:
4.0.0.Alpha2 release
Copied: tags/jbpm-jpdl-4.0.0.alpha2/flow/plugins/org.jboss.tools.flow.common (from rev 13885, trunk/flow/plugins/org.jboss.tools.flow.common)
15 years, 10 months
JBoss Tools SVN: r13885 - tags/jbpm-jpdl-4.0.0.alpha2/jbpm/builders.
by jbosstools-commits@lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-02-27 05:08:28 -0500 (Fri, 27 Feb 2009)
New Revision: 13885
Added:
tags/jbpm-jpdl-4.0.0.alpha2/jbpm/builders/org.jboss.tools.flow.jpdl4.builder/
Log:
4.0.0.Alpha2 release
Copied: tags/jbpm-jpdl-4.0.0.alpha2/jbpm/builders/org.jboss.tools.flow.jpdl4.builder (from rev 13884, trunk/jbpm/builders/org.jboss.tools.flow.jpdl4.builder)
15 years, 10 months