JBoss Tools SVN: r25891 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-10-18 05:06:25 -0400 (Mon, 18 Oct 2010)
New Revision: 25891
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java
Log:
JBIDE-7348
https://jira.jboss.org/browse/JBIDE-7348
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2010-10-18 07:55:52 UTC (rev 25890)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2010-10-18 09:06:25 UTC (rev 25891)
@@ -386,6 +386,13 @@
}
component = sp.getComponent("beatles.Pall");
+ for (int i = 0; i < 100; i++) {
+ if(component == null) break;
+ System.out.println("beatles.Pall not removed yet " + i + " " + classFile.exists() + " " + component.getAllDeclarations().size() + " " + component.getJavaDeclaration());
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {}
+ }
assertNull(component);
Collection<ISeamPackage> ps = sp.getPackages();
13 years, 8 months
JBoss Tools SVN: r25890 - trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2010-10-18 03:55:52 -0400 (Mon, 18 Oct 2010)
New Revision: 25890
Modified:
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java
Log:
JBIDE-7348
https://jira.jboss.org/browse/JBIDE-7348
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2010-10-18 06:33:25 UTC (rev 25889)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/view/SeamComponentsViewTest.java 2010-10-18 07:55:52 UTC (rev 25890)
@@ -13,6 +13,7 @@
import java.io.IOException;
import java.io.InputStream;
+import java.util.Collection;
import java.util.Iterator;
import junit.framework.TestCase;
@@ -42,6 +43,7 @@
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.seam.core.ISeamComponent;
import org.jboss.tools.seam.core.ISeamPackage;
+import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.ui.ISeamUiConstants;
import org.jboss.tools.seam.ui.SeamPerspectiveFactory;
@@ -351,7 +353,11 @@
public void testDeleteComponentInClass(){
classFile = project.getFile("JavaSource/demo/Person.java");
+ ISeamProject sp = SeamCorePlugin.getSeamProject(project, true);
+ ISeamComponent component = sp.getComponent("beatles.Pall");
+ assertNotNull(component);
+
CommonNavigator navigator = getSeamComponentsView();
navigator.getCommonViewer().expandAll();
@@ -361,7 +367,7 @@
assertTrue("Package \"beatles\" not found!",seamPackage!=null);
if(seamPackage != null){
- ISeamComponent component = findSeamComponent(seamPackage, "beatles.Pall");
+ component = findSeamComponent(seamPackage, "beatles.Pall");
assertTrue("Component \"beatles.Pall\" not found!",component!=null);
}
@@ -378,7 +384,16 @@
}catch(Exception ex){
JUnitUtils.fail("Cannot delete file JavaSource/demo/Person.java", ex);
}
+
+ component = sp.getComponent("beatles.Pall");
+ assertNull(component);
+ Collection<ISeamPackage> ps = sp.getPackages();
+ if(ps != null) for (ISeamPackage p: ps) {
+ System.out.println(p.getName());
+ assertFalse("beatles".equals(p.getName()));
+ }
+
// refreshProject(project);
navigator.getCommonViewer().refresh(true);
13 years, 8 months
JBoss Tools SVN: r25889 - trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2010-10-18 02:33:25 -0400 (Mon, 18 Oct 2010)
New Revision: 25889
Modified:
trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java
Log:
JBIDE-7028: change the bpel-deploy.xml to deploy.xml
Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java
===================================================================
--- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java 2010-10-18 02:47:06 UTC (rev 25888)
+++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java 2010-10-18 06:33:25 UTC (rev 25889)
@@ -1,19 +1,11 @@
package org.eclipse.bpel.apache.ode.deploy.ui.wizards;
-import java.io.File;
-
import org.eclipse.bpel.apache.ode.deploy.ui.util.DeployUtils;
import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jface.dialogs.IDialogPage;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -52,7 +44,7 @@
public ODEDeployWizardPage(ISelection selection) {
super("ODEDeployDescriptorWizardPage");
setTitle("Apache ODE Deployment Descriptor");
- setDescription("This wizard creates a new Apache ODE descriptor file (bpel-deploy.xml). Note that the file name cannot be changed.");
+ setDescription("This wizard creates a new Apache ODE descriptor file (deploy.xml). Note that the file name cannot be changed.");
this.selection = selection;
}
@@ -88,7 +80,7 @@
label.setText("&File name:");
fileText = new Text(container, SWT.BORDER | SWT.SINGLE);
- fileText.setText("bpel-deploy.xml");
+ fileText.setText("deploy.xml");
fileText.setEditable(false);
gd = new GridData(GridData.FILL_HORIZONTAL);
fileText.setLayoutData(gd);
13 years, 8 months
JBoss Tools SVN: r25888 - trunk/build/aggregate/site.
by jbosstools-commits＠lists.jboss.org
Author: nickboldt
Date: 2010-10-17 22:47:06 -0400 (Sun, 17 Oct 2010)
New Revision: 25888
Modified:
trunk/build/aggregate/site/index-template.html
trunk/build/aggregate/site/index.html
Log:
move css file into parent
Modified: trunk/build/aggregate/site/index-template.html
===================================================================
--- trunk/build/aggregate/site/index-template.html 2010-10-15 19:11:45 UTC (rev 25887)
+++ trunk/build/aggregate/site/index-template.html 2010-10-18 02:47:06 UTC (rev 25888)
@@ -2,7 +2,7 @@
<head>
<title>JBoss Tools ${update.site.description} Update Site${update.site.version}</title>
<style>
-@import url("web/site.css");
+@import url("../web/site.css");
</style>
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
Modified: trunk/build/aggregate/site/index.html
===================================================================
--- trunk/build/aggregate/site/index.html 2010-10-15 19:11:45 UTC (rev 25887)
+++ trunk/build/aggregate/site/index.html 2010-10-18 02:47:06 UTC (rev 25888)
@@ -2,7 +2,7 @@
<head>
<title>JBoss Tools Nightly Build Update Site: 3.2.0.M1.2010-07-16_17-40-51-H69</title>
<style>
-@import url("web/site.css");
+@import url("../web/site.css");
</style>
</head>
<body marginheight="0" marginwidth="0" leftmargin="0" topmargin="0">
13 years, 8 months
JBoss Tools SVN: r25887 - in trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor: template and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2010-10-15 15:11:45 -0400 (Fri, 15 Oct 2010)
New Revision: 25887
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/VpeVisualDomBuilder.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/ISelectionManager.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java
Log:
https://jira.jboss.org/browse/JBIDE-7258 :
DnD in VPE does not work with rich:calendar
- problem fixing
- code refactoring
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 2010-10-15 18:55:11 UTC (rev 25886)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2010-10-15 19:11:45 UTC (rev 25887)
@@ -10,6 +10,8 @@
******************************************************************************/
package org.jboss.tools.vpe.editor;
+import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface;
+
import java.text.MessageFormat;
import java.util.Iterator;
import java.util.LinkedList;
@@ -95,6 +97,7 @@
import org.jboss.tools.vpe.dnd.VpeDnD;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.mapping.VpeDomMapping;
+import org.jboss.tools.vpe.editor.mapping.VpeElementMapping;
import org.jboss.tools.vpe.editor.mapping.VpeNodeMapping;
import org.jboss.tools.vpe.editor.menu.VpeMenuCreator;
import org.jboss.tools.vpe.editor.mozilla.MozillaEditor;
@@ -122,6 +125,7 @@
import org.jboss.tools.vpe.editor.util.DocTypeUtil;
import org.jboss.tools.vpe.editor.util.SelectionUtil;
import org.jboss.tools.vpe.editor.util.VisualDomUtil;
+import org.jboss.tools.vpe.editor.util.VpeNodesManagingUtil;
import org.jboss.tools.vpe.messages.VpeUIMessages;
import org.jboss.tools.vpe.resref.core.AbsoluteFolderReferenceList;
import org.jboss.tools.vpe.resref.core.CSSReferenceList;
@@ -134,8 +138,10 @@
import org.mozilla.interfaces.nsIDOMKeyEvent;
import org.mozilla.interfaces.nsIDOMMouseEvent;
import org.mozilla.interfaces.nsIDOMMutationEvent;
+import org.mozilla.interfaces.nsIDOMNSUIEvent;
import org.mozilla.interfaces.nsIDOMNode;
import org.mozilla.interfaces.nsISelection;
+import org.mozilla.interfaces.nsISelectionDisplay;
import org.mozilla.interfaces.nsISelectionListener;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
@@ -164,8 +170,6 @@
private VpeSourceDomBuilder sourceBuilder;
private VpeVisualDomBuilder visualBuilder;
private VpeDnD vpeDnD;
- /** @deprecated */
- private VpeSelectionBuilder selectionBuilder;
// private VpeVisualKeyHandler visualKeyHandler;
private ActiveEditorSwitcher switcher = new ActiveEditorSwitcher();
private Attr lastRemovedAttr;
@@ -286,10 +290,8 @@
// initialization visual selection controller
visualSelectionController = new VpeSelectionController(visualEditor
.getEditor().getSelectionController());
+ visualSelectionController.setSelectionFlags(nsISelectionDisplay.DISPLAY_ALL);
- selectionBuilder = new VpeSelectionBuilder(domMapping, sourceBuilder,
- visualBuilder, visualSelectionController);
-
selectionManager = new SelectionManager(pageContext, sourceEditor,
visualSelectionController);
@@ -1203,7 +1205,9 @@
if (vpeDnD.isDragIconClicked(mouseEvent)) {
vpeDnD.dragStart(mouseEvent);
} else {
- selectionManager.setSelection(mouseEvent);
+ selectionManager.setSelection(
+ VisualDomUtil.getTargetNode(mouseEvent),
+ queryInterface(mouseEvent, nsIDOMNSUIEvent.class).getRangeOffset());
}
}
} finally {
@@ -1247,9 +1251,13 @@
mouseUpSelectionReasonFlag = false;
}
- if (visualBuilder.doToggle(VisualDomUtil
- .getTargetNode(mouseEvent))) {
- // selectionBuilder.setClickContentAreaSelection();
+ Element toggledElement = visualBuilder.doToggle(visualNode);
+ if (toggledElement != null) {
+ VpeNodeMapping toggledMapping
+ = getDomMapping().getNearNodeMapping(toggledElement);
+ if (toggledMapping != null && toggledMapping.getVisualNode() != null) {
+ selectionManager.setSelection(toggledMapping.getVisualNode(), 0);
+ }
}
}
} finally {
@@ -2353,21 +2361,6 @@
this.xulRunnerEditor = xulRunnerEditor;
}
- /**
- * @return the selectionBuilder
- */
- public VpeSelectionBuilder getSelectionBuilder() {
- return selectionBuilder;
- }
-
- /**
- * @param selectionBuilder
- * the selectionBuilder to set
- */
- public void setSelectionBuilder(VpeSelectionBuilder selectionBuilder) {
- this.selectionBuilder = selectionBuilder;
- }
-
public boolean isVisualEditorVisible() {
return visualEditorVisible;
}
@@ -2438,8 +2431,7 @@
visualSelectionController = new VpeSelectionController(visualEditor
.getEditor().getSelectionController());
- selectionBuilder = new VpeSelectionBuilder(domMapping,
- sourceBuilder, visualBuilder, visualSelectionController);
+ visualSelectionController.setSelectionFlags(nsISelectionDisplay.DISPLAY_ALL);
selectionManager = new SelectionManager(pageContext, sourceEditor,
visualSelectionController);
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2010-10-15 18:55:11 UTC (rev 25886)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2010-10-15 19:11:45 UTC (rev 25887)
@@ -940,9 +940,9 @@
}
}
- public boolean doToggle(nsIDOMNode visualNode) {
+ public Element doToggle(nsIDOMNode visualNode) {
if (visualNode == null) {
- return false;
+ return null;
}
nsIDOMElement visualElement = null;
try {
@@ -951,18 +951,18 @@
visualElement = queryInterface(visualNode.getParentNode(), nsIDOMElement.class);
}
if (visualElement == null) {
- return false;
+ return null;
}
nsIDOMAttr toggleIdAttr = visualElement
.getAttributeNode(VPE_USER_TOGGLE_ID);
if (toggleIdAttr == null) {
- return false;
+ return null;
}
String toggleId = toggleIdAttr.getNodeValue();
if (toggleId == null) {
- return false;
+ return null;
}
boolean toggleLookup = false;
@@ -975,7 +975,7 @@
nsIDOMElement selectedElem = getLastSelectedElement();
// Fixes JBIDE-1823 author dmaliarevich
if (null == selectedElem) {
- return false;
+ return null;
}
VpeElementMapping elementMapping = null;
VpeNodeMapping nodeMapping = domMapping.getNodeMapping(selectedElem);
@@ -997,7 +997,7 @@
}
Node sourceNode = domMapping.getSourceNode(selectedElem);
if (sourceNode == null) {
- return false;
+ return null;
}
Element sourceElement = (Element) (sourceNode instanceof Element ? sourceNode
@@ -1039,10 +1039,10 @@
((VpeToggableTemplate) template).toggle(this, sourceElement,
toggleId);
updateElement(sourceElement);
- return true;
+ return sourceElement;
}
}
- return false;
+ return null;
}
public void removeAttribute(Element sourceElement, String name) {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java 2010-10-15 18:55:11 UTC (rev 25886)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualKeyHandler.java 2010-10-15 19:11:45 UTC (rev 25887)
@@ -1758,15 +1758,7 @@
return nearestElement;
}
-
-
- private VpeSelectionBuilder getSelectionBuilder() {
-
- return pageContext.getEditPart().getController().getSelectionBuilder();
- }
-
private nsIDOMElement getSelectedNode() {
-
return pageContext.getEditPart().getController().getXulRunnerEditor().getLastSelectedElement();
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/ISelectionManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/ISelectionManager.java 2010-10-15 18:55:11 UTC (rev 25886)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/ISelectionManager.java 2010-10-15 19:11:45 UTC (rev 25887)
@@ -10,7 +10,7 @@
******************************************************************************/
package org.jboss.tools.vpe.editor.template;
-import org.mozilla.interfaces.nsIDOMMouseEvent;
+import org.mozilla.interfaces.nsIDOMNode;
import org.mozilla.interfaces.nsISelection;
/**
@@ -33,7 +33,7 @@
*
* @param mouseEvent
*/
- public void setSelection(nsIDOMMouseEvent mouseEvent);
+ public void setSelection(nsIDOMNode visualNode, int rangeOffset);
/**
* to bring in correspondence visual selection and source selection
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java 2010-10-15 18:55:11 UTC (rev 25886)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/SelectionManager.java 2010-10-15 19:11:45 UTC (rev 25887)
@@ -11,8 +11,6 @@
package org.jboss.tools.vpe.editor.template;
-import static org.jboss.tools.vpe.xulrunner.util.XPCOM.queryInterface;
-
import org.eclipse.swt.graphics.Point;
import org.eclipse.wst.sse.ui.StructuredTextEditor;
import org.eclipse.wst.xml.core.internal.document.NodeImpl;
@@ -25,10 +23,7 @@
import org.jboss.tools.vpe.editor.selection.VpeSelectionController;
import org.jboss.tools.vpe.editor.util.SelectionUtil;
import org.jboss.tools.vpe.editor.util.TextUtil;
-import org.jboss.tools.vpe.editor.util.VisualDomUtil;
import org.jboss.tools.vpe.editor.util.VpeNodesManagingUtil;
-import org.mozilla.interfaces.nsIDOMMouseEvent;
-import org.mozilla.interfaces.nsIDOMNSUIEvent;
import org.mozilla.interfaces.nsIDOMNode;
import org.mozilla.interfaces.nsISelection;
import org.mozilla.interfaces.nsISelectionController;
@@ -64,185 +59,108 @@
this.selectionController = selectionController;
}
+ /* TODO: merge this method with setSelection(nsIDOMNode visualNode, int rangeOffset) */
public final void setSelection(nsISelection selection) {
-
- nsIDOMNode selectedVisualNode = SelectionUtil
- .getSelectedNode(selection);
-
- if (selectedVisualNode == null)
+ nsIDOMNode visualNode = SelectionUtil.getSelectedNode(selection);
+ if (visualNode == null) {
return;
+ }
- VpeNodeMapping nodeMapping = VpeNodesManagingUtil.getNodeMapping(
- getDomMapping(), selectedVisualNode);
-
- if (nodeMapping == null)
+ SelectionData selectionData = getSelectionData(visualNode);
+ if (selectionData == null) {
return;
-
- // visual node which will be selected
- nsIDOMNode targetVisualNode;
- // source node which will be selected
- Node targetSourceNode;
-
- boolean isNodeEditable;
-
- // if mapping is elementMapping
- if (nodeMapping instanceof VpeElementMapping) {
-
- VpeElementMapping elementMapping = (VpeElementMapping) nodeMapping;
-
- VpeTemplate template = elementMapping.getTemplate();
-
- NodeData nodeData = template.getNodeData(selectedVisualNode,
- elementMapping.getElementData(), getDomMapping());
-
- if (nodeData != null) {
-
- isNodeEditable = nodeData.isEditable();
- if (nodeData.getSourceNode() != null) {
- targetSourceNode = nodeData.getSourceNode();
-
- } else {
-
- isNodeEditable = false;
- targetSourceNode = elementMapping.getSourceNode();
-
- }
-
- targetVisualNode = nodeData.getVisualNode();
- } else {
-
- targetVisualNode = elementMapping.getVisualNode();
- targetSourceNode = elementMapping.getSourceNode();
- isNodeEditable = false;
- }
-
- } else {
- // here we processed text node
- targetVisualNode = nodeMapping.getVisualNode();
- targetSourceNode = nodeMapping.getSourceNode();
- isNodeEditable = true;
-
}
- if (targetVisualNode.getNodeType() != nsIDOMNode.TEXT_NODE
- && SelectionUtil.getLastSelectedNode(getPageContext()) == targetVisualNode)
+ if (selectionData.getVisualNode().getNodeType() != nsIDOMNode.TEXT_NODE
+ && SelectionUtil.getLastSelectedNode(getPageContext())
+ == selectionData.getVisualNode()) {
return;
-
- int focusOffset;
- int length;
-
- if (isNodeEditable) {
-
+ }
+ /*************** Calculate selection range ****************************/
+ int selectionOffset;
+ int selectionLength;
+ if (selectionData.isNodeEditable()) {
Point sourceSelectionRange = SelectionUtil.getSourceSelectionRange(
- selection, targetSourceNode);
-
- focusOffset = sourceSelectionRange.x;
- length = sourceSelectionRange.y;
-
+ selection, selectionData.getSourceNode());
+ selectionOffset = sourceSelectionRange.x;
+ selectionLength = sourceSelectionRange.y;
} else {
-
- focusOffset = 0;
- length = NodesManagingUtil.getNodeLength(targetSourceNode);
-
+ selectionOffset = 0;
+ selectionLength = NodesManagingUtil.getNodeLength(selectionData.getSourceNode());
}
-
+ /*************** Apply selection to views *****************************/
// set source selection
- SelectionUtil.setSourceSelection(getPageContext(), targetSourceNode,
- focusOffset, length);
-
+ SelectionUtil.setSourceSelection(getPageContext(), selectionData.getSourceNode(),
+ selectionOffset, selectionLength);
// paint visual selection
getPageContext().getVisualBuilder().setSelectionRectangle(
- targetVisualNode);
+ selectionData.getVisualNode());
+ }
+ final public void setSelection(nsIDOMNode visualNode, int rangeOffset) {
+ SelectionData selectionData = getSelectionData(visualNode);
+ if (selectionData == null) {
+ return;
+ }
+ /*************** Calculate selection range ****************************/
+ int selectionOffset;
+ int selectionLength;
+ if (selectionData.isNodeEditable()) {
+ selectionOffset = rangeOffset;
+ selectionLength = 0;
+ } else {
+ selectionOffset = 0;
+ selectionLength = NodesManagingUtil.getNodeLength(selectionData.getSourceNode());
+ }
+ /*************** Apply selection to views *****************************/
+ SelectionUtil.clearSelection(selectionController);
+ SelectionUtil.setSourceSelection(getPageContext(),
+ selectionData.getSourceNode(),
+ selectionOffset, selectionLength);
+ // paint selection rectangle
+ getPageContext().getVisualBuilder().setSelectionRectangle(
+ selectionData.getVisualNode());
}
- final public void setSelection(nsIDOMMouseEvent mouseEvent) {
-
- // get visual node by event
- nsIDOMNode visualNode = VisualDomUtil.getTargetNode(mouseEvent);
-
+ private SelectionData getSelectionData(nsIDOMNode visualNode) {
// get element mapping
VpeNodeMapping nodeMapping = VpeNodesManagingUtil.getNodeMapping(
getDomMapping(), visualNode);
- if (nodeMapping == null)
- return;
-
- // visual node which will be selected
- nsIDOMNode targetVisualNode;
- // source node which will be selected
- Node targetSourceNode;
-
+ if (nodeMapping == null) {
+ return null;
+ }
+
+ nsIDOMNode targetVisualNode; // visual node which will be selected
+ Node targetSourceNode; // source node which will be selected
boolean isNodeEditable;
-
- // if mapping is elementMapping
if (nodeMapping instanceof VpeElementMapping) {
-
VpeElementMapping elementMapping = (VpeElementMapping) nodeMapping;
+ NodeData nodeData = elementMapping.getTemplate().getNodeData(
+ visualNode, elementMapping.getElementData(), getDomMapping());
- VpeTemplate template = elementMapping.getTemplate();
-
- NodeData nodeData = template.getNodeData(visualNode, elementMapping
- .getElementData(), getDomMapping());
-
if (nodeData != null) {
-
- isNodeEditable = nodeData.isEditable();
-
+ targetVisualNode = nodeData.getVisualNode();
if (nodeData.getSourceNode() != null) {
-
targetSourceNode = nodeData.getSourceNode();
-
+ isNodeEditable = nodeData.isEditable();
} else {
-
- isNodeEditable = false;
targetSourceNode = elementMapping.getSourceNode();
-
+ isNodeEditable = false;
}
-
- targetVisualNode = nodeData.getVisualNode();
-
} else {
-
targetVisualNode = elementMapping.getVisualNode();
- targetSourceNode = elementMapping.getSourceNode();
+ targetSourceNode = elementMapping.getSourceNode();
isNodeEditable = false;
-
}
-
- }
-
- else {
-
+ } else {
targetVisualNode = nodeMapping.getVisualNode();
targetSourceNode = nodeMapping.getSourceNode();
isNodeEditable = true;
-
}
-
- // get nsIDOMNSUIEvent event
- nsIDOMNSUIEvent nsuiEvent = queryInterface(mouseEvent, nsIDOMNSUIEvent.class);
-
- int selectionOffset;
- int selectionLength;
-
- if (isNodeEditable) {
- selectionOffset = nsuiEvent.getRangeOffset();
- selectionLength = 0;
- } else {
-
- selectionOffset = 0;
- selectionLength = NodesManagingUtil.getNodeLength(targetSourceNode);
-
- }
-
- SelectionUtil.clearSelection(selectionController);
- SelectionUtil.setSourceSelection(getPageContext(), targetSourceNode,
- selectionOffset, selectionLength);
- // paint selection rectangle
- getPageContext().getVisualBuilder().setSelectionRectangle(
- targetVisualNode);
-
+ SelectionData selectionData = new SelectionData(
+ targetVisualNode, targetSourceNode, isNodeEditable);
+ return selectionData;
}
/**
@@ -391,3 +309,36 @@
}
}
+
+class SelectionData {
+ private nsIDOMNode visualNode;
+ private Node sourceNode;
+ private boolean isNodeEditable;
+
+ public SelectionData(nsIDOMNode visualNode, Node sourceNode,
+ boolean isNodeEditable) {
+ super();
+ this.visualNode = visualNode;
+ this.sourceNode = sourceNode;
+ this.isNodeEditable = isNodeEditable;
+ }
+
+ public nsIDOMNode getVisualNode() {
+ return visualNode;
+ }
+ public void setVisualNode(nsIDOMNode visualNode) {
+ this.visualNode = visualNode;
+ }
+ public Node getSourceNode() {
+ return sourceNode;
+ }
+ public void setSourceNode(Node sourceNode) {
+ this.sourceNode = sourceNode;
+ }
+ public boolean isNodeEditable() {
+ return isNodeEditable;
+ }
+ public void setNodeEditable(boolean isNodeEditable) {
+ this.isNodeEditable = isNodeEditable;
+ }
+}
13 years, 8 months
JBoss Tools SVN: r25886 - trunk/portlet/features/org.jboss.tools.portlet.feature.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2010-10-15 14:55:11 -0400 (Fri, 15 Oct 2010)
New Revision: 25886
Modified:
trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml
Log:
JBIDE-7293 Dynamic Web Project isn't created properly when JBoss Portlet Tool installed
Modified: trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml
===================================================================
--- trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml 2010-10-15 17:39:37 UTC (rev 25885)
+++ trunk/portlet/features/org.jboss.tools.portlet.feature/feature.xml 2010-10-15 18:55:11 UTC (rev 25886)
@@ -1,35 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.tools.portlet.feature"
- label="%featureName"
- version="1.1.0.qualifier"
- provider-name="%providerName"
- plugin="org.jboss.tools.portlet.ui">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <plugin
- id="org.jboss.tools.portlet.core"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.jboss.tools.portlet.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.portlet.feature"
+ label="%featureName"
+ version="1.1.0.qualifier"
+ provider-name="%providerName"
+ plugin="org.jboss.tools.portlet.ui">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <requires>
+ <import feature="org.jboss.tools.seam.feature" version="3.2.0" match="greaterOrEqual"/>
+ </requires>
+
+ <plugin
+ id="org.jboss.tools.portlet.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.portlet.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
13 years, 8 months
JBoss Tools SVN: r25885 - in trunk/hibernatetools: tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2010-10-15 13:39:37 -0400 (Fri, 15 Oct 2010)
New Revision: 25885
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java
trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java
Log:
https://jira.jboss.org/browse/JBIDE-7278 - fixed
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java 2010-10-15 17:24:37 UTC (rev 25884)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConfigurationXMLFactory.java 2010-10-15 17:39:37 UTC (rev 25885)
@@ -78,7 +78,9 @@
rootName = ConfigurationXMLStrings.CONFIGURATION;
}
Element root = DocumentFactory.getInstance().createElement(rootName);
- String tmp = file2Str(prefs.getConfigXMLFile());
+ final ConsoleConfiguration cc2ExtractConfigXMLFile = new ConsoleConfiguration(prefs);
+ final File configXMLFile = cc2ExtractConfigXMLFile.getConfigXMLFile();
+ String tmp = file2Str(configXMLFile);
tmp = makePathRelative(tmp, pathPlace2Generate, pathWorkspacePath);
updateAttr(root, tmp, ConfigurationXMLStrings.CONFIGURATIONFILE);
tmp = file2Str(prefs.getPropertyFile());
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-10-15 17:24:37 UTC (rev 25884)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-10-15 17:39:37 UTC (rev 25885)
@@ -77,10 +77,14 @@
* Reset so a new configuration or sessionfactory is needed.
*
*/
- public void reset() {
+ public boolean reset() {
+ boolean res = false;
// reseting state
- configuration = null;
- closeSessionFactory();
+ if (configuration != null) {
+ configuration = null;
+ res = true;
+ }
+ res = res || closeSessionFactory();
if (executionContext != null) {
executionContext.execute(new Command() {
public Object execute() {
@@ -96,30 +100,68 @@
}
});
}
- fakeDrivers.clear();
- cleanUpClassLoader();
- fireConfigurationReset();
+ if (fakeDrivers.size() > 0) {
+ fakeDrivers.clear();
+ res = true;
+ }
+ res = res || cleanUpClassLoader();
+ if (res) {
+ fireConfigurationReset();
+ }
executionContext = null;
+ return res;
}
- public void cleanUpClassLoader() {
+ protected boolean cleanUpClassLoader() {
+ boolean res = false;
ClassLoader classLoaderTmp = classLoader;
while (classLoaderTmp != null) {
if (classLoaderTmp instanceof ConsoleConfigClassLoader) {
((ConsoleConfigClassLoader)classLoaderTmp).close();
+ res = true;
}
classLoaderTmp = classLoaderTmp.getParent();
}
- classLoader = null;
+ if (classLoader != null) {
+ classLoader = null;
+ res = true;
+ }
+ return res;
}
+
+ /**
+ * Create class loader - so it uses the original urls list from preferences.
+ */
+ protected void reinitClassLoader() {
+ boolean recreateFlag = true;
+ final URL[] customClassPathURLs = PreferencesClassPathUtils.getCustomClassPathURLs(prefs);
+ if (classLoader != null) {
+ // check -> do not recreate class loader in case if urls list is the same
+ final URL[] oldURLS = classLoader.getURLs();
+ if (customClassPathURLs.length == oldURLS.length) {
+ int i = 0;
+ for (; i < oldURLS.length; i++) {
+ if (!customClassPathURLs[i].sameFile(oldURLS[i])) {
+ break;
+ }
+ }
+ if (i == oldURLS.length) {
+ recreateFlag = false;
+ }
+ }
+ }
+ if (recreateFlag) {
+ reset();
+ classLoader = createClassLoader(customClassPathURLs);
+ }
+ }
public void build() {
configuration = buildWith(null, true);
fireConfigurationBuilt();
}
- protected ConsoleConfigClassLoader createClassLoader() {
- final URL[] customClassPathURLs = PreferencesClassPathUtils.getCustomClassPathURLs(prefs);
+ protected ConsoleConfigClassLoader createClassLoader(final URL[] customClassPathURLs) {
ConsoleConfigClassLoader classLoader = AccessController.doPrivileged(new PrivilegedAction<ConsoleConfigClassLoader>() {
public ConsoleConfigClassLoader run() {
return new ConsoleConfigClassLoader(customClassPathURLs, getParentClassLoader()) {
@@ -157,9 +199,7 @@
*
*/
public Configuration buildWith(final Configuration cfg, final boolean includeMappings) {
- if (classLoader == null) {
- classLoader = createClassLoader();
- }
+ reinitClassLoader();
executionContext = new DefaultExecutionContext(getName(), classLoader);
Configuration result = (Configuration)execute(new Command() {
public Object execute() {
@@ -295,8 +335,12 @@
if (prefs != null) {
configXMLFile = prefs.getConfigXMLFile();
}
- if (configXMLFile == null && classLoader != null) {
- URL url = classLoader.findResource("hibernate.cfg.xml"); //$NON-NLS-1$
+ if (configXMLFile == null) {
+ URL url = null;
+ reinitClassLoader();
+ if (classLoader != null) {
+ url = classLoader.findResource("hibernate.cfg.xml"); //$NON-NLS-1$
+ }
if (url != null) {
URI uri = null;
try {
@@ -330,12 +374,15 @@
return executionContext;
}
- public void closeSessionFactory() {
+ public boolean closeSessionFactory() {
+ boolean res = false;
if (sessionFactory != null) {
fireFactoryClosing(sessionFactory);
sessionFactory.close();
sessionFactory = null;
+ res = true;
}
+ return res;
}
public Settings getSettings(final Configuration cfg) {
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java 2010-10-15 17:24:37 UTC (rev 25884)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/CodeGenXMLFactoryTest.java 2010-10-15 17:39:37 UTC (rev 25885)
@@ -85,12 +85,11 @@
}
public URL[] getCustomClassPathURLS() {
- URL[] urls = new URL[4];
+ URL[] urls = new URL[3];
try {
urls[0] = new File("ejb3-persistence.jar").toURL(); //$NON-NLS-1$
urls[1] = new File("hibernate3.jar").toURL(); //$NON-NLS-1$
urls[2] = new File("hsqldb.jar").toURL(); //$NON-NLS-1$
- urls[3] = null;
} catch (IOException e) {
}
return urls;
13 years, 8 months
JBoss Tools SVN: r25884 - trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-15 13:24:37 -0400 (Fri, 15 Oct 2010)
New Revision: 25884
Modified:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltacloudIntegrationTest.java
Log:
[JBIDE-7320] trying to invoke gem
Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltacloudIntegrationTest.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltacloudIntegrationTest.java 2010-10-15 17:22:49 UTC (rev 25883)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltacloudIntegrationTest.java 2010-10-15 17:24:37 UTC (rev 25884)
@@ -14,7 +14,8 @@
ScriptEngine engine = factory.getEngineByName("jruby");
try {
engine.eval("puts('Hello')");
- engine.eval("gem install rake");
+// engine.eval("gem install rake");
+ engine.eval("jgem list");
} catch (ScriptException exception) {
exception.printStackTrace();
}
13 years, 8 months
JBoss Tools SVN: r25883 - in trunk/seam: tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2010-10-15 13:22:49 -0400 (Fri, 15 Oct 2010)
New Revision: 25883
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java
Log:
https://jira.jboss.org/browse/JBIDE-7219
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2010-10-15 17:15:23 UTC (rev 25882)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2010-10-15 17:22:49 UTC (rev 25883)
@@ -624,6 +624,10 @@
model.setStringProperty(
ISeamFacetDataModelProperties.SEAM_PROJECT_NAME, p);
+
+ if(!visible)
+ setCodeGenerationProperties();
+
model.setStringProperty(
ISeamFacetDataModelProperties.SESSION_BEAN_PACKAGE_NAME,
getSessionPkgName(p));
@@ -645,11 +649,12 @@
model.setStringProperty(
ISeamFacetDataModelProperties.SEAM_TEST_PROJECT,
testProjectNameditor.getValueAsString());
-
}
}
private boolean needToShowConnectionProfile = true;
+
+ private boolean visible = false;
/**
* It is overridden to fill Code Generation group with the default package
@@ -657,9 +662,8 @@
*/
@Override
public void setVisible(boolean visible) {
-
if (visible) {
- setCodeGenerationProperties();
+ this.visible = true;
setDefaultSeamRuntime();
boolean jpaFacetAdded = getJpaFacetVersion() != null;
if (jpaFacetAdded == needToShowConnectionProfile){
@@ -677,11 +681,10 @@
};
private void initDefaultWizardProperties() {
- setCodeGenerationProperties();
setDefaultSeamRuntime();
validate();
}
-
+
/*
* Fills Code Generation group with the default package names.
*/
@@ -691,19 +694,13 @@
if(p == null)
return;
-
- if(sessionBeanPkgNameditor.getValueAsString() == null || "".equals(sessionBeanPkgNameditor.getValueAsString().trim()))
- sessionBeanPkgNameditor.setValue(getSessionPkgName(p));
- if(entityBeanPkgNameditor.getValueAsString() == null || "".equals(entityBeanPkgNameditor.getValueAsString().trim()))
- entityBeanPkgNameditor.setValue(getEntityPkgName(p));
- if(testsPkgNameditor.getValueAsString() == null || "".equals(testsPkgNameditor.getValueAsString().trim()))
- testsPkgNameditor.setValue(getTestPkgName(p));
- if(ejbProjectNameditor.getValueAsString() == null || "".equals(ejbProjectNameditor.getValueAsString().trim()))
- ejbProjectNameditor.setValue(getEJBProjectName(p));
- if(earProjectNameditor.getValueAsString() == null || "".equals(earProjectNameditor.getValueAsString().trim()))
- earProjectNameditor.setValue(getEARProjectName(p));
- if(testProjectNameditor.getValueAsString() == null || "".equals(testProjectNameditor.getValueAsString().trim()))
- testProjectNameditor.setValue(getTestProjectName(p));
+
+ sessionBeanPkgNameditor.setValue(getSessionPkgName(p));
+ entityBeanPkgNameditor.setValue(getEntityPkgName(p));
+ testsPkgNameditor.setValue(getTestPkgName(p));
+ ejbProjectNameditor.setValue(getEJBProjectName(p));
+ earProjectNameditor.setValue(getEARProjectName(p));
+ testProjectNameditor.setValue(getTestProjectName(p));
}
private String getSessionPkgName(String projectName) {
@@ -975,7 +972,6 @@
*
*/
public void finishPressed() {
- setCodeGenerationProperties();
model.removeListener(validatorDelegate);
};
@@ -983,21 +979,21 @@
* test method
*/
public String getSessionBeanPkgName() {
- return (String) sessionBeanPkgNameditor.getValue();
+ return sessionBeanPkgNameditor.getValueAsString();
}
/*
* test method
*/
public String getEntityBeanPkgName() {
- return (String) entityBeanPkgNameditor.getValue();
+ return entityBeanPkgNameditor.getValueAsString();
}
/*
* test method
*/
public String getTestsPkgName() {
- return (String) testsPkgNameditor.getValue();
+ return testsPkgNameditor.getValueAsString();
}
private Map<String, IStatus> doPackStatus(IStatus status, String propertyName, String message){
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java 2010-10-15 17:15:23 UTC (rev 25882)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/PackageNamesTest.java 2010-10-15 17:22:49 UTC (rev 25883)
@@ -49,10 +49,10 @@
}
public void testProjectNameWithSpaces() {
+ showWizard();
+
wizard.getDataModel().setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, "Seam Test Project");
- showWizard();
-
String sessionBeanPkgName = seamWizPg.getSessionBeanPkgName();
String entityBeanPkgName = seamWizPg.getEntityBeanPkgName();
String testsPkgName = seamWizPg.getTestsPkgName();
@@ -73,10 +73,10 @@
}
public void testProjectNameWithUnderlines() {
- wizard.getDataModel().setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, "Seam_Test_Project");
-
showWizard();
+ wizard.getDataModel().setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, "Seam_Test_Project");
+
String sessionBeanPkgName = seamWizPg.getSessionBeanPkgName();
String entityBeanPkgName = seamWizPg.getEntityBeanPkgName();
String testsPkgName = seamWizPg.getTestsPkgName();
@@ -87,10 +87,10 @@
}
public void testProjectNameWithMinuses() {
- wizard.getDataModel().setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, "Seam-Test-Project");
-
showWizard();
+ wizard.getDataModel().setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, "Seam-Test-Project");
+
String sessionBeanPkgName = seamWizPg.getSessionBeanPkgName();
String entityBeanPkgName = seamWizPg.getEntityBeanPkgName();
String testsPkgName = seamWizPg.getTestsPkgName();
@@ -101,10 +101,10 @@
}
public void testProjectNameWithMultipleDots() {
- wizard.getDataModel().setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, "Seam...Test....Project");
-
showWizard();
+ wizard.getDataModel().setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, "Seam...Test....Project");
+
String sessionBeanPkgName = seamWizPg.getSessionBeanPkgName();
String entityBeanPkgName = seamWizPg.getEntityBeanPkgName();
String testsPkgName = seamWizPg.getTestsPkgName();
13 years, 8 months
JBoss Tools SVN: r25882 - trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2010-10-15 13:15:23 -0400 (Fri, 15 Oct 2010)
New Revision: 25882
Modified:
trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java
Log:
[JBIDE-7320] trying to invoke ruby scripts in a bundle
Modified: trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java
===================================================================
--- trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java 2010-10-15 17:13:27 UTC (rev 25881)
+++ trunk/deltacloud/tests/org.jboss.tools.deltacloud.test/src/org/jboss/tools/internal/deltacloud/test/DeltaCloudTestSuite.java 2010-10-15 17:15:23 UTC (rev 25882)
@@ -19,7 +19,6 @@
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({
- DeltacloudIntegrationTest.class
})
public class DeltaCloudTestSuite {
13 years, 8 months