JBoss Tools SVN: r8512 - tags/jbosstools-2.1.1.GA.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2008-06-03 18:17:44 -0400 (Tue, 03 Jun 2008)
New Revision: 8512
Added:
tags/jbosstools-2.1.1.GA/common/
Log:
tagging jbosstools-2.1.1.GA
Copied: tags/jbosstools-2.1.1.GA/common (from rev 8511, branches/jbosstools-2.1.x/common)
16 years, 7 months
JBoss Tools SVN: r8511 - tags/jbosstools-2.1.1.GA.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2008-06-03 18:17:40 -0400 (Tue, 03 Jun 2008)
New Revision: 8511
Added:
tags/jbosstools-2.1.1.GA/as/
Log:
tagging jbosstools-2.1.1.GA
Copied: tags/jbosstools-2.1.1.GA/as (from rev 8510, branches/jbosstools-2.1.x/as)
16 years, 7 months
JBoss Tools SVN: r8510 - tags.
by jbosstools-commits＠lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2008-06-03 18:17:35 -0400 (Tue, 03 Jun 2008)
New Revision: 8510
Added:
tags/jbosstools-2.1.1.GA/
Log:
tagging jbosstools-2.1.1.GA
16 years, 7 months
JBoss Tools SVN: r8509 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-06-03 15:24:43 -0400 (Tue, 03 Jun 2008)
New Revision: 8509
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
Log:
JBIDE-2288
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2008-06-03 19:11:02 UTC (rev 8508)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2008-06-03 19:24:43 UTC (rev 8509)
@@ -27,6 +27,7 @@
import java.util.ArrayList;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -273,6 +274,9 @@
* @return returns whether an error was found
*/
protected boolean localSafeDelete(IPath deployPath, final EventLogTreeItem event) {
+ String serverDeployFolder = server.getDeployDirectory();
+ Assert.isTrue(!deployPath.toFile().equals(new Path(serverDeployFolder).toFile()), "An attempt to delete your entire deploy folder has been prevented. This should never happen");
+
final Boolean[] errorFound = new Boolean[] { new Boolean(false)};
IFileUtilListener listener = new IFileUtilListener() {
public void fileCoppied(File source, File dest, boolean result,Exception e) {}
16 years, 7 months
JBoss Tools SVN: r8508 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2008-06-03 15:11:02 -0400 (Tue, 03 Jun 2008)
New Revision: 8508
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
Log:
http://jira.jboss.org/jira/browse/JBIDE-675
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-06-03 18:59:14 UTC (rev 8507)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2008-06-03 19:11:02 UTC (rev 8508)
@@ -433,8 +433,7 @@
getJobQueue().clear();
return Status.CANCEL_STATUS;
}
- monitor.beginTask(VpeUIMessages.VPE_UPDATE_JOB_TITLE, getJobQueue().size());
- monitor.worked(1);
+ monitor.worked(1);
notifyChangedInUiThread(notifier, eventType, feature, oldValue, newValue, pos);
if (monitor.isCanceled()) {
getJobQueue().clear();
@@ -446,6 +445,8 @@
if(getJobQueue().size()>0) {
Job job =getJobQueue().getFirst();
job.schedule();
+ }else {
+ monitor.done();
}
}
return Status.OK_STATUS;
@@ -455,6 +456,7 @@
if(getJobQueue().size()==1) {
setProgressMonitor(null);
nonUIJob.setProgressGroup(getProgressMonitor(), 100);
+ getProgressMonitor().beginTask(VpeUIMessages.VPE_UPDATE_JOB_TITLE, IProgressMonitor.UNKNOWN);
Job job = getJobQueue().getFirst();
job.schedule();
} else {
16 years, 7 months
JBoss Tools SVN: r8507 - branches/jbosstools-2.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-06-03 14:59:14 -0400 (Tue, 03 Jun 2008)
New Revision: 8507
Modified:
branches/jbosstools-2.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
Log:
JBIDE-2288
Modified: branches/jbosstools-2.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
===================================================================
--- branches/jbosstools-2.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2008-06-03 14:55:33 UTC (rev 8506)
+++ branches/jbosstools-2.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2008-06-03 18:59:14 UTC (rev 8507)
@@ -27,6 +27,7 @@
import java.util.ArrayList;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -273,6 +274,9 @@
* @return returns whether an error was found
*/
protected boolean localSafeDelete(IPath deployPath, final EventLogTreeItem event) {
+ String serverDeployFolder = server.getDeployDirectory();
+ Assert.isTrue(!deployPath.toFile().equals(new Path(serverDeployFolder).toFile()), "An attempt to delete your entire deploy folder has been prevented. This should never happen");
+
final Boolean[] errorFound = new Boolean[] { new Boolean(false)};
IFileUtilListener listener = new IFileUtilListener() {
public void fileCoppied(File source, File dest, boolean result,Exception e) {}
16 years, 7 months
JBoss Tools SVN: r8506 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-06-03 10:55:33 -0400 (Tue, 03 Jun 2008)
New Revision: 8506
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
Log:
JBIDE-2288
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2008-06-03 14:25:49 UTC (rev 8505)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2008-06-03 14:55:33 UTC (rev 8506)
@@ -129,7 +129,7 @@
localSafeDelete(deployPath, eventRoot);
IStatus[] results;
- if( !deployPackaged(moduleTree))
+ if( !deployPackaged(moduleTree) && !isBinaryObject(moduleTree))
results = new PublishUtil(server.getServer()).publishFull(members, deployPath, monitor);
else if( isBinaryObject(moduleTree))
results = copyBinaryModule(moduleTree);
@@ -157,7 +157,7 @@
eventRoot.setProperty(PublisherEventLogger.CHANGED_RESOURCE_COUNT, countChanges(delta));
IStatus[] results = new IStatus[] {};
IPath deployPath = getDeployPath(moduleTree);
- if( !deployPackaged(moduleTree))
+ if( !deployPackaged(moduleTree) && !isBinaryObject(moduleTree))
results = new PublishUtil(server.getServer()).publishDelta(delta, deployPath, monitor);
else if( delta.length > 0 ) {
if( isBinaryObject(moduleTree))
16 years, 7 months
JBoss Tools SVN: r8505 - branches/jbosstools-2.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2008-06-03 10:25:49 -0400 (Tue, 03 Jun 2008)
New Revision: 8505
Modified:
branches/jbosstools-2.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
Log:
JBIDE-2288
Modified: branches/jbosstools-2.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
===================================================================
--- branches/jbosstools-2.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2008-06-03 14:20:05 UTC (rev 8504)
+++ branches/jbosstools-2.1.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2008-06-03 14:25:49 UTC (rev 8505)
@@ -129,7 +129,7 @@
localSafeDelete(deployPath, eventRoot);
IStatus[] results;
- if( !deployPackaged(moduleTree))
+ if( !deployPackaged(moduleTree) && !isBinaryObject(moduleTree))
results = new PublishUtil(server.getServer()).publishFull(members, deployPath, monitor);
else if( isBinaryObject(moduleTree))
results = copyBinaryModule(moduleTree);
@@ -157,7 +157,7 @@
eventRoot.setProperty(PublisherEventLogger.CHANGED_RESOURCE_COUNT, countChanges(delta));
IStatus[] results = new IStatus[] {};
IPath deployPath = getDeployPath(moduleTree);
- if( !deployPackaged(moduleTree))
+ if( !deployPackaged(moduleTree) && !isBinaryObject(moduleTree))
results = new PublishUtil(server.getServer()).publishDelta(delta, deployPath, monitor);
else if( delta.length > 0 ) {
if( isBinaryObject(moduleTree))
16 years, 7 months
JBoss Tools SVN: r8504 - in trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages: editor and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2008-06-03 10:20:05 -0400 (Tue, 03 Jun 2008)
New Revision: 8504
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/SeamUIPagesMessages.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesEditor.java
trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/messages.properties
Log:
JBIDE-1189
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/SeamUIPagesMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/SeamUIPagesMessages.java 2008-06-03 13:22:39 UTC (rev 8503)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/SeamUIPagesMessages.java 2008-06-03 14:20:05 UTC (rev 8504)
@@ -22,6 +22,10 @@
public static String PAGES_DIAGRAM_VIEW_TEMPLATE;
public static String PAGES_DIAGRAM_EXCEPTION_TEMPLATE;
+
+ public static String SEAM_PAGES_EDITOR_TITLE;
+ public static String SEAM_PAGES_EDITOR_SOURCE_TAB;
+ public static String SEAM_PAGES_EDITOR_DIAGRAM_TAB;
public static ResourceBundle getResourceBundle() {
try {
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-06-03 13:22:39 UTC (rev 8503)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/PagesEditor.java 2008-06-03 14:20:05 UTC (rev 8504)
@@ -36,6 +36,7 @@
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Insets;
import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.gef.ContextMenuProvider;
import org.eclipse.gef.DefaultEditDomain;
import org.eclipse.gef.EditPart;
@@ -104,6 +105,7 @@
import org.jboss.tools.common.gef.outline.xpl.DiagramContentOutlinePage;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.XModelTransferBuffer;
+import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants;
import org.jboss.tools.seam.pages.xml.model.helpers.SeamPagesProcessStructureHelper;
import org.jboss.tools.seam.ui.pages.SeamUIPagesMessages;
import org.jboss.tools.seam.ui.pages.SeamUiPagesPlugin;
@@ -590,7 +592,13 @@
}
protected void setSelectedModelObject(XModelObject object) {
- PagesElement element = getPagesModel().findElement(object);
+ if(object == null) return;
+ EObject element = getPagesModel().findElement(object);
+
+ if(element == null) {
+ element = getPagesModel().findLink(object);
+ }
+
if (element == null)
return;
EditPart part = (EditPart) viewer.getEditPartRegistry()
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesEditor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesEditor.java 2008-06-03 13:22:39 UTC (rev 8503)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/editor/SeamPagesEditor.java 2008-06-03 14:20:05 UTC (rev 8504)
@@ -11,6 +11,7 @@
import org.jboss.tools.common.model.ui.editor.EditorDescriptor;
import org.jboss.tools.common.model.ui.texteditors.XMLTextEditorComponent;
import org.jboss.tools.seam.pages.xml.model.SeamPagesConstants;
+import org.jboss.tools.seam.ui.pages.SeamUIPagesMessages;
import org.jboss.tools.seam.ui.pages.SeamUiPagesPlugin;
public class SeamPagesEditor extends ObjectMultiPageEditor {
@@ -35,11 +36,9 @@
protected void doCreatePages() {
if (isAppropriateNature() || true /* JBIDE-541 */) {
- //TODO restore
createGuiPage();
treeFormPage = createTreeFormPage();
- //TODO use constant
- treeFormPage.setTitle("Seam Pages Editor");
+ treeFormPage.setTitle(SeamUIPagesMessages.SEAM_PAGES_EDITOR_TITLE);
// treeFormPage.addFilter(constraint);
treeFormPage.initialize(getModelObject());
addFormPage(treeFormPage);
@@ -61,7 +60,7 @@
guiEditor = new SeamPagesGuiEditor();
guiEditor.init(getEditorSite(), getEditorInput());
int index = addPage(guiEditor, input);
- setPageText(index, "Diagram");
+ setPageText(index, SeamUIPagesMessages.SEAM_PAGES_EDITOR_DIAGRAM_TAB);
guiEditor.setInput(input);
selectionProvider.setHost(guiEditor.getSelectionProvider());
guiEditor.addErrorSelectionListener(createErrorSelectionListener());
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/messages.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/messages.properties 2008-06-03 13:22:39 UTC (rev 8503)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui.pages/src/org/jboss/tools/seam/ui/pages/messages.properties 2008-06-03 14:20:05 UTC (rev 8504)
@@ -1,3 +1,9 @@
+SEAM_UI_PAGES_PLUGIN_NO_MESSAGES=
+PAGESDIAGRAM_SELECT=Select
+PAGESDIAGRAM_MARQUEE=Marquee
+PAGESDIAGRAM_CREATE_NEW_CONNECTION=Create New Connection
+
+SEAM_PAGES_EDITOR_TITLE=Seam Pages Editor
SEAM_PAGES_EDITOR_SOURCE_TAB=Source
SEAM_PAGES_EDITOR_DIAGRAM_TAB=Graphical
PAGES_DIAGRAM_VIEW_TEMPLATE=Add Page
16 years, 7 months
JBoss Tools SVN: r8503 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java.
by jbosstools-commits＠lists.jboss.org
Author: estherbin
Date: 2008-06-03 09:22:39 -0400 (Tue, 03 Jun 2008)
New Revision: 8503
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
Log:
Fix http://jira.jboss.com/jira/browse/JBIDE-2227
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2008-06-03 12:55:11 UTC (rev 8502)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/text/java/SeamELProposalProcessor.java 2008-06-03 13:22:39 UTC (rev 8503)
@@ -476,13 +476,18 @@
return false;
if ('"' == doc.getChar(offset) || '\'' == doc.getChar(offset)) {
- int backslashCount = 0;
- while (doc.getChar(offset - 1 - backslashCount) == '\\') {
- backslashCount++;
- }
- if (backslashCount%2 == 0)
- return false;
- }
+ int backslashCount = 0;
+ while (doc.getChar(offset - 1 - backslashCount) == '\\') {
+ backslashCount++;
+ }
+ // Added by estherbin
+ // JBIDE-2227
+ if ((backslashCount > 0) && (backslashCount % 2 == 0)) {
+ return false;
+ } else {
+ return true;
+ }
+ }
if ('{' == doc.getChar(offset) &&
(offset - 1) >= 0 &&
16 years, 7 months