JBoss Tools SVN: r17039 - trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/ant.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-08-10 17:24:39 -0400 (Mon, 10 Aug 2009)
New Revision: 17039
Modified:
trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/ant/SimpleAntTest.java
Log:
I've to add //$NON-NLS-1$ behind "BUILD FAILURE\n" and "BUILD SUCCESSFUL\n" to make sure it is not interfere with build status analizer, it could be taken as real build output when it appears in warnings output
Modified: trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/ant/SimpleAntTest.java
===================================================================
--- trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/ant/SimpleAntTest.java 2009-08-10 19:01:54 UTC (rev 17038)
+++ trunk/archives/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/core/ant/SimpleAntTest.java 2009-08-10 21:24:39 UTC (rev 17039)
@@ -110,11 +110,11 @@
}
public void out(String text) {
- if( "BUILD SUCCESSFUL\n".equals(text))
+ if( "BUILD SUCCESSFUL\n".equals(text)) //$NON-NLS-1$
done = success = true;
}
public void err(String text) {
- if( "BUILD FAILED\n".equals(text)) {
+ if( "BUILD FAILED\n".equals(text)) { //$NON-NLS-1$
success = false;
done = true;
}
16 years, 4 months
JBoss Tools SVN: r17038 - branches/jbosstools-3.0.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: 2009-08-10 15:01:54 -0400 (Mon, 10 Aug 2009)
New Revision: 17038
Modified:
branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
Log:
JBIDE-4629 fix in branch
Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java
===================================================================
--- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2009-08-10 17:11:28 UTC (rev 17037)
+++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2009-08-10 19:01:54 UTC (rev 17038)
@@ -28,6 +28,7 @@
import java.util.Arrays;
import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
@@ -37,7 +38,12 @@
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
+import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
+import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
+import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.ModuleCoreNature;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
import org.eclipse.wst.server.core.IModule;
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.internal.DeletedModule;
@@ -201,9 +207,10 @@
protected IPath getDeployPath(IModule[] moduleTree) {
IPath root = new Path( server.getDeployFolder() );
String type, name;
- for( int i = 0; i < moduleTree.length; i++ ) {
+ for( int i = 0; i < moduleTree.length; i++ ) {
type = moduleTree[i].getModuleType().getId();
name = moduleTree[i].getName();
+
if( new Path(name).segmentCount() > 1 )
// we strongly suspect this is a binary object and not a project
return root.append(new Path(name).lastSegment());
@@ -211,6 +218,8 @@
root = root.append(name + ".ear");
else if( "jst.web".equals(type))
root = root.append(name + ".war");
+ else if( "jst.utility".equals(type) && i == 1 && "jst.ear".equals(moduleTree[i-1].getModuleType().getId()))
+ root = root.append(getUtilityInEarProjectURI(moduleTree));
else if( "jst.utility".equals(type) && i >= 1 && "jst.web".equals(moduleTree[i-1].getModuleType().getId()))
root = root.append("WEB-INF").append("lib").append(name + ".jar");
else if( "jst.connector".equals(type)) {
@@ -223,6 +232,39 @@
return root;
}
+
+ // hack to fix JBIDE-4629, the case of a util project directly inside an ear project
+ protected String getUtilityInEarProjectURI(IModule[] moduleTree) {
+ IProject earProject = moduleTree[0].getProject();
+ IVirtualComponent earComponent = ComponentCore.createComponent(earProject);
+ IVirtualComponent utilComponent = ComponentCore.createComponent(moduleTree[1].getProject());
+ String aURI = null;
+ if (utilComponent!=null && earComponent!=null && J2EEProjectUtilities.isEARProject(earProject)) {
+ EARArtifactEdit earEdit = null;
+ try {
+ earEdit = EARArtifactEdit.getEARArtifactEditForRead(earComponent);
+ if (earEdit != null) {
+ IVirtualReference [] refs = earComponent.getReferences();
+ for(int i=0; i<refs.length; i++){
+ if(refs[i].getReferencedComponent().equals(utilComponent)){
+ IPath path = refs[i].getRuntimePath();
+ path = path == null ? new Path("/") : path;
+ return path.append(refs[i].getArchiveName()).toString();
+ }
+ }
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ if (earEdit != null)
+ earEdit.dispose();
+ }
+ }
+
+
+ return moduleTree[1].getName() + ".jar";
+ }
+
protected boolean isBinaryObject(IModule[] moduleTree) {
String name;
for( int i = 0; i < moduleTree.length; i++ ) {
16 years, 4 months
JBoss Tools SVN: r17037 - in branches/jbosstools-3.0.x/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: dgolovin
Date: 2009-08-10 13:11:28 -0400 (Mon, 10 Aug 2009)
New Revision: 17037
Added:
branches/jbosstools-3.0.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite220CR1.java
branches/jbosstools-3.0.x/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite220CR1.java
Log:
tests suites for seam 2.2.0.CR1 added
Added: branches/jbosstools-3.0.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite220CR1.java
===================================================================
--- branches/jbosstools-3.0.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite220CR1.java (rev 0)
+++ branches/jbosstools-3.0.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite220CR1.java 2009-08-10 17:11:28 UTC (rev 17037)
@@ -0,0 +1,5 @@
+package org.jboss.tools.seam.core.test.project.facet;
+
+public class Seam20XFacetTestSuite220CR1 extends Seam20XFacetTestSuite201GA {
+
+}
Property changes on: branches/jbosstools-3.0.x/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/project/facet/Seam20XFacetTestSuite220CR1.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: branches/jbosstools-3.0.x/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite220CR1.java
===================================================================
--- branches/jbosstools-3.0.x/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite220CR1.java (rev 0)
+++ branches/jbosstools-3.0.x/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite220CR1.java 2009-08-10 17:11:28 UTC (rev 17037)
@@ -0,0 +1,5 @@
+package org.jboss.tools.seam.ui.test.wizard;
+
+public class Seam20XOperationsTestSuite220CR1 extends
+ Seam20XOperationsTestSuite201GA {
+}
Property changes on: branches/jbosstools-3.0.x/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/Seam20XOperationsTestSuite220CR1.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
16 years, 4 months
JBoss Tools SVN: r17036 - in trunk/hibernatetools: plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-08-10 11:24:19 -0400 (Mon, 10 Aug 2009)
New Revision: 17036
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/AutoLayoutAction.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleConnectionsAction.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeExpandStateAction.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAction.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Shape.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Utils.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ComponentShapeEditPart.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ExpandableShapeEditPart.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ExpandableShapeTreeEditPart.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeTreeEditPart.java
trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsBase.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4148 - junit tests fix
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/AutoLayoutAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/AutoLayoutAction.java 2009-08-10 11:24:11 UTC (rev 17035)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/AutoLayoutAction.java 2009-08-10 15:24:19 UTC (rev 17036)
@@ -20,14 +20,15 @@
public class AutoLayoutAction extends DiagramBaseAction {
public static final String ACTION_ID = "auto_layout_id"; //$NON-NLS-1$
+ private static final ImageDescriptor img =
+ ImageDescriptor.createFromFile(DiagramViewer.class, "icons/autolayout.png"); //$NON-NLS-1$
public AutoLayoutAction(DiagramViewer editor) {
super(editor);
setId(ACTION_ID);
setText(DiagramViewerMessages.AutoLayoutAction_auto_layout);
setToolTipText(DiagramViewerMessages.AutoLayoutAction_auto_layout);
- setImageDescriptor(ImageDescriptor.createFromFile(
- DiagramViewer.class, "icons/autolayout.png")); //$NON-NLS-1$
+ setImageDescriptor(img);
}
public void run() {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java 2009-08-10 11:24:11 UTC (rev 17035)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ExportImageAction.java 2009-08-10 15:24:19 UTC (rev 17036)
@@ -40,13 +40,14 @@
DiagramViewerMessages.ExportImageAction_jpg_format, DiagramViewerMessages.ExportImageAction_bmp_format };
private FileDialog saveDialog = null;
+ private static final ImageDescriptor img =
+ ImageDescriptor.createFromFile(DiagramViewer.class, "icons/export.png"); //$NON-NLS-1$
public ExportImageAction(DiagramViewer editor) {
super(editor);
setId(ACTION_ID);
setText(DiagramViewerMessages.ExportImageAction_export_as_image);
- setImageDescriptor(ImageDescriptor.createFromFile(
- DiagramViewer.class,"icons/export.png")); //$NON-NLS-1$
+ setImageDescriptor(img);
}
/**
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java 2009-08-10 11:24:11 UTC (rev 17035)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java 2009-08-10 15:24:19 UTC (rev 17036)
@@ -16,6 +16,7 @@
import org.eclipse.gef.ui.actions.SelectionAction;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PartInitException;
@@ -36,12 +37,14 @@
*/
public class OpenMappingAction extends SelectionAction {
public static final String ACTION_ID = "org.jboss.tools.hibernate.ui.diagram.editors.actions.open.mapping"; //$NON-NLS-1$
+ private static final ImageDescriptor img =
+ UiPlugin.getImageDescriptor("icons/mapping.gif"); //$NON-NLS-1$
public OpenMappingAction(IWorkbenchPart part) {
super(part);
setId(ACTION_ID);
setText(DiagramViewerMessages.OpenMappingAction_open_mapping_file);
- setImageDescriptor(UiPlugin.getImageDescriptor("icons/mapping.gif")); //$NON-NLS-1$
+ setImageDescriptor(img);
}
public void run() {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java 2009-08-10 11:24:11 UTC (rev 17035)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java 2009-08-10 15:24:19 UTC (rev 17036)
@@ -6,6 +6,7 @@
import org.eclipse.gef.ui.actions.SelectionAction;
import org.eclipse.jdt.core.JavaModelException;
+import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PartInitException;
@@ -28,12 +29,14 @@
*/
public class OpenSourceAction extends SelectionAction {
public static final String ACTION_ID = "org.jboss.tools.hibernate.ui.diagram.editors.actions.open.source"; //$NON-NLS-1$
+ private static final ImageDescriptor img =
+ UiPlugin.getImageDescriptor("icons/java.gif"); //$NON-NLS-1$
public OpenSourceAction(IWorkbenchPart part) {
super(part);
setId(ACTION_ID);
setText(DiagramViewerMessages.OpenSourceAction_open_source_file);
- setImageDescriptor(UiPlugin.getImageDescriptor("icons/java.gif")); //$NON-NLS-1$
+ setImageDescriptor(img);
}
public void run() {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleConnectionsAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleConnectionsAction.java 2009-08-10 11:24:11 UTC (rev 17035)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleConnectionsAction.java 2009-08-10 15:24:19 UTC (rev 17036)
@@ -20,14 +20,15 @@
public class ToggleConnectionsAction extends DiagramBaseAction {
public static final String ACTION_ID = "toggleConnectionsId"; //$NON-NLS-1$
+ private static final ImageDescriptor img =
+ ImageDescriptor.createFromFile(DiagramViewer.class, "icons/toggleconnections.png"); //$NON-NLS-1$
public ToggleConnectionsAction(DiagramViewer editor) {
super(editor);
setId(ACTION_ID);
setText(DiagramViewerMessages.ToggleConnectionsAction_toggle_connections);
setToolTipText(DiagramViewerMessages.ToggleConnectionsAction_toggle_connections);
- setImageDescriptor(ImageDescriptor.createFromFile(
- DiagramViewer.class, "icons/toggleconnections.png")); //$NON-NLS-1$
+ setImageDescriptor(img);
}
public void run() {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeExpandStateAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeExpandStateAction.java 2009-08-10 11:24:11 UTC (rev 17035)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeExpandStateAction.java 2009-08-10 15:24:19 UTC (rev 17036)
@@ -32,14 +32,15 @@
public class ToggleShapeExpandStateAction extends DiagramBaseAction {
public static final String ACTION_ID = "toggleShapeExpandStateId"; //$NON-NLS-1$
+ private static final ImageDescriptor img =
+ ImageDescriptor.createFromFile(DiagramViewer.class, "icons/toggleshapeexpandstate.png"); //$NON-NLS-1$
public ToggleShapeExpandStateAction(DiagramViewer editor) {
super(editor);
setId(ACTION_ID);
setText(DiagramViewerMessages.ToggleShapeExpandStateAction_toggle_expand_state);
setToolTipText(DiagramViewerMessages.ToggleShapeExpandStateAction_toggle_expand_state);
- setImageDescriptor(ImageDescriptor.createFromFile(
- DiagramViewer.class, "icons/toggleshapeexpandstate.png")); //$NON-NLS-1$
+ setImageDescriptor(img);
}
@SuppressWarnings("unchecked")
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAction.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAction.java 2009-08-10 11:24:11 UTC (rev 17035)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAction.java 2009-08-10 15:24:19 UTC (rev 17036)
@@ -34,14 +34,15 @@
public class ToggleShapeVisibleStateAction extends DiagramBaseAction {
public static final String ACTION_ID = "toggleShapeVisibleStateId"; //$NON-NLS-1$
+ private static final ImageDescriptor img =
+ ImageDescriptor.createFromFile(DiagramViewer.class, "icons/toggleshapevisiblestate.png"); //$NON-NLS-1$
public ToggleShapeVisibleStateAction(DiagramViewer editor) {
super(editor);
setId(ACTION_ID);
setText(DiagramViewerMessages.ToggleShapeVisibleStateAction_toggle_visible_state);
setToolTipText(DiagramViewerMessages.ToggleShapeVisibleStateAction_toggle_visible_state);
- setImageDescriptor(ImageDescriptor.createFromFile(
- DiagramViewer.class, "icons/toggleshapevisiblestate.png")); //$NON-NLS-1$
+ setImageDescriptor(img);
}
@SuppressWarnings("unchecked")
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java 2009-08-10 11:24:11 UTC (rev 17035)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java 2009-08-10 15:24:19 UTC (rev 17036)
@@ -407,7 +407,19 @@
if (processed.contains(shapeCol)) {
continue;
}
- if (dbColumn.getName().equals(((Column)(shapeCol).getOrmElement()).getName())) {
+ if (shape.equals(shapeCol)) {
+ continue;
+ }
+ Object ormElement = shapeCol.getOrmElement();
+ String name2 = ""; //$NON-NLS-1$
+ if (ormElement instanceof Column) {
+ Column dbColumn2 = (Column)ormElement;
+ name2 = dbColumn2.getName();
+ } else if (ormElement instanceof Property) {
+ Property property2 = (Property)ormElement;
+ name2 = property2.getName();
+ }
+ if (dbColumn.getName().equals(name2)) {
if (!isConnectionExist(shape, shapeCol)) {
connections.add(new Connection(shape, shapeCol));
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java 2009-08-10 11:24:11 UTC (rev 17035)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java 2009-08-10 15:24:19 UTC (rev 17036)
@@ -38,6 +38,7 @@
import org.hibernate.mapping.RootClass;
import org.jboss.tools.hibernate.ui.diagram.UiPlugin;
import org.jboss.tools.hibernate.ui.diagram.rulers.DiagramRuler;
+import org.jboss.tools.hibernate.ui.view.OrmLabelProvider;
/**
* The whole diagram, all information about diagram elements are here.
@@ -53,6 +54,7 @@
// hibernate console configuration is the source of diagram elements
private ConsoleConfiguration consoleConfig;
+ private OrmLabelProvider labelProvider = new OrmLabelProvider();
private boolean dirty = false;
private HashMap<String, OrmShape> elements = new HashMap<String, OrmShape>();
@@ -74,6 +76,7 @@
public OrmDiagram(ConsoleConfiguration consoleConfig, RootClass ioe) {
createRulers();
this.consoleConfig = consoleConfig;
+ labelProvider.setConfig(consoleConfig.getConfiguration());
ormElements = new RootClass[1];
ormElements[0] = ioe;
entityNames = new String[1];
@@ -88,6 +91,7 @@
public OrmDiagram(ConsoleConfiguration consoleConfig, RootClass[] ioe) {
createRulers();
this.consoleConfig = consoleConfig;
+ labelProvider.setConfig(consoleConfig.getConfiguration());
ormElements = new RootClass[ioe.length];
System.arraycopy(ioe, 0, ormElements, 0, ioe.length);
// should sort elements - cause different sort order gives different file name
@@ -476,4 +480,8 @@
public String getKey() {
return null;
}
+
+ public OrmLabelProvider getLabelProvider() {
+ return labelProvider;
+ }
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Shape.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Shape.java 2009-08-10 11:24:11 UTC (rev 17035)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Shape.java 2009-08-10 15:24:19 UTC (rev 17036)
@@ -21,7 +21,6 @@
import org.hibernate.mapping.Property;
import org.hibernate.mapping.Value;
import org.jboss.tools.hibernate.ui.view.HibernateUtils;
-import org.jboss.tools.hibernate.ui.view.OrmLabelProvider;
/**
* Shape which represents particular Hibernate element on the diagram.
@@ -50,7 +49,6 @@
*/
private BaseElement parent;
- private static OrmLabelProvider labelProvider = new OrmLabelProvider();
private static IPropertyDescriptor[] descriptors_property;
private static IPropertyDescriptor[] descriptors_column;
@@ -252,8 +250,7 @@
} else if (col != null) {
String sqlType = col.getSqlType();
if (sqlType == null) {
- labelProvider.setConfig(getOrmDiagram().getConsoleConfig().getConfiguration());
- labelProvider.updateColumnSqlType(col);
+ getOrmDiagram().getLabelProvider().updateColumnSqlType(col);
sqlType = col.getSqlType();
}
StringBuffer name = new StringBuffer();
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Utils.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Utils.java 2009-08-10 11:24:11 UTC (rev 17035)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Utils.java 2009-08-10 15:24:19 UTC (rev 17036)
@@ -26,11 +26,15 @@
public static boolean isConnectionExist(Shape source, Shape target) {
boolean res = false;
if (source != null && target != null) {
- List<Connection> sourceConnections = source.getSourceConnections();
- for (int i = 0; !res && i < sourceConnections.size(); i++) {
- Connection conn = sourceConnections.get(i);
- if (conn.getTarget().equals(target)) {
- res = true;
+ if (source.equals(target)) {
+ res = true;
+ } else {
+ List<Connection> sourceConnections = source.getSourceConnections();
+ for (int i = 0; !res && i < sourceConnections.size(); i++) {
+ Connection conn = sourceConnections.get(i);
+ if (conn.getTarget().equals(target)) {
+ res = true;
+ }
}
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ComponentShapeEditPart.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ComponentShapeEditPart.java 2009-08-10 11:24:11 UTC (rev 17035)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ComponentShapeEditPart.java 2009-08-10 15:24:19 UTC (rev 17036)
@@ -43,8 +43,8 @@
@Override
protected IFigure createFigure() {
ComponentFigure figure = new ComponentFigure();
- figure.createTitle(ormLabelProvider.getText(getElement()),
- ormLabelProvider.getImage(getElement()), getColor());
+ figure.createTitle(getOrmDiagram().getLabelProvider().getText(getElement()),
+ getOrmDiagram().getLabelProvider().getImage(getElement()), getColor());
figure.setBorder(new FocusBorder());
figure.setSize(-1, -1);
return figure;
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ExpandableShapeEditPart.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ExpandableShapeEditPart.java 2009-08-10 11:24:11 UTC (rev 17035)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ExpandableShapeEditPart.java 2009-08-10 15:24:19 UTC (rev 17036)
@@ -47,9 +47,9 @@
@Override
protected IFigure createFigure() {
Label label = new TitleLabel();
- label.setText(ormLabelProvider.getText(getElement()));
+ label.setText(getOrmDiagram().getLabelProvider().getText(getElement()));
label.setBackgroundColor(getColor());
- label.setIcon(ormLabelProvider.getImage(getElement()));
+ label.setIcon(getOrmDiagram().getLabelProvider().getImage(getElement()));
label.setLabelAlignment(PositionConstants.LEFT);
label.setOpaque(true);
TopLineBorder border =
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ExpandableShapeTreeEditPart.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ExpandableShapeTreeEditPart.java 2009-08-10 11:24:11 UTC (rev 17035)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ExpandableShapeTreeEditPart.java 2009-08-10 15:24:19 UTC (rev 17036)
@@ -17,10 +17,8 @@
import java.util.List;
import org.eclipse.swt.widgets.Tree;
-import org.hibernate.console.ConsoleConfiguration;
import org.jboss.tools.hibernate.ui.diagram.editors.model.ExpandableShape;
import org.jboss.tools.hibernate.ui.diagram.editors.model.Shape;
-import org.jboss.tools.hibernate.ui.view.OrmLabelProvider;
/**
* @author some modifications from Vitali
@@ -29,8 +27,6 @@
org.eclipse.gef.editparts.AbstractTreeEditPart implements
PropertyChangeListener {
- protected OrmLabelProvider ormLabelProvider;
-
/**
* Constructor initializes this with the given model.
*
@@ -39,8 +35,6 @@
*/
public ExpandableShapeTreeEditPart(ExpandableShape model) {
super(model);
- ConsoleConfiguration cfg = model.getOrmDiagram().getConsoleConfig();
- ormLabelProvider = new OrmLabelProvider(cfg.getConfiguration());
}
/**
@@ -79,8 +73,8 @@
}
Shape model = (Shape) getModel();
Object element = model.getOrmElement();
- setWidgetImage(ormLabelProvider.getImage(element));
- setWidgetText(ormLabelProvider.getText(element));
+ setWidgetImage(getExpandeableShape().getOrmDiagram().getLabelProvider().getImage(element));
+ setWidgetText(getExpandeableShape().getOrmDiagram().getLabelProvider().getText(element));
}
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java 2009-08-10 11:24:11 UTC (rev 17035)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java 2009-08-10 15:24:19 UTC (rev 17036)
@@ -63,8 +63,8 @@
Object element = getElement();
TitleFigure figure = new TitleFigure();
figure.setLayoutManager(new ToolbarLayout());
- String text = ormLabelProvider.getText(element);
- figure.createTitle(text, ormLabelProvider.getImage(element), getColor());
+ String text = getOrmDiagram().getLabelProvider().getText(element);
+ figure.createTitle(text, getOrmDiagram().getLabelProvider().getImage(element), getColor());
figure.setBackgroundColor(getBackgroundColor());
return figure;
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java 2009-08-10 11:24:11 UTC (rev 17035)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java 2009-08-10 15:24:19 UTC (rev 17036)
@@ -31,7 +31,6 @@
import org.eclipse.gef.editpolicies.SelectionEditPolicy;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
-import org.hibernate.console.ConsoleConfiguration;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.Component;
import org.hibernate.mapping.DependantValue;
@@ -45,23 +44,17 @@
import org.jboss.tools.hibernate.ui.diagram.editors.model.Connection;
import org.jboss.tools.hibernate.ui.diagram.editors.model.BaseElement;
import org.jboss.tools.hibernate.ui.diagram.editors.model.Shape;
-import org.jboss.tools.hibernate.ui.view.OrmLabelProvider;
/**
* @author some modifications from Vitali
*/
public class ShapeEditPart extends OrmEditPart implements NodeEditPart {
- protected OrmLabelProvider ormLabelProvider = new OrmLabelProvider();
protected ChopboxAnchorNearestSide sourceAnchor = null;
protected ChopboxAnchorNearestSide targetAnchor = null;
public void setModel(Object model) {
super.setModel(model);
- if (getOrmDiagram() != null) {
- ConsoleConfiguration consoleConfig = getOrmDiagram().getConsoleConfig();
- ormLabelProvider.setConfig(consoleConfig.getConfiguration());
- }
}
protected void createEditPolicies() {
@@ -74,9 +67,9 @@
@Override
protected IFigure createFigure() {
Label label = new Label();
- label.setText(ormLabelProvider.getText(getElement()));
+ label.setText(getOrmDiagram().getLabelProvider().getText(getElement()));
label.setBackgroundColor(getColor());
- label.setIcon(ormLabelProvider.getImage(getElement()));
+ label.setIcon(getOrmDiagram().getLabelProvider().getImage(getElement()));
label.setLabelAlignment(PositionConstants.LEFT);
label.setOpaque(true);
TopLineBorder border = new TopLineBorder(1, 2 + getModelShape().getIndent(), 1, 2);
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeTreeEditPart.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeTreeEditPart.java 2009-08-10 11:24:11 UTC (rev 17035)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeTreeEditPart.java 2009-08-10 15:24:19 UTC (rev 17036)
@@ -16,10 +16,7 @@
import java.util.List;
import org.eclipse.swt.widgets.Tree;
-import org.hibernate.console.ConsoleConfiguration;
-import org.jboss.tools.hibernate.ui.diagram.editors.model.ExpandableShape;
import org.jboss.tools.hibernate.ui.diagram.editors.model.Shape;
-import org.jboss.tools.hibernate.ui.view.OrmLabelProvider;
/**
* @author some modifications from Vitali
@@ -28,8 +25,6 @@
org.eclipse.gef.editparts.AbstractTreeEditPart implements
PropertyChangeListener {
- protected OrmLabelProvider ormLabelProvider;
-
/**
* Constructor initializes this with the given model.
*
@@ -38,8 +33,6 @@
*/
public ShapeTreeEditPart(Shape model) {
super(model);
- ConsoleConfiguration cfg = model.getOrmDiagram().getConsoleConfig();
- ormLabelProvider = new OrmLabelProvider(cfg.getConfiguration());
}
/**
@@ -47,8 +40,8 @@
*
* @return Model of this.
*/
- protected ExpandableShape getExpandeableShape() {
- return (ExpandableShape) getModel();
+ protected Shape getShape() {
+ return (Shape) getModel();
}
/**
@@ -73,8 +66,8 @@
}
Shape model = (Shape) getModel();
Object element = model.getOrmElement();
- setWidgetImage(ormLabelProvider.getImage(element));
- setWidgetText(ormLabelProvider.getText(element));
+ setWidgetImage(getShape().getOrmDiagram().getLabelProvider().getImage(element));
+ setWidgetText(getShape().getOrmDiagram().getLabelProvider().getText(element));
}
}
Modified: trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsBase.java
===================================================================
--- trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsBase.java 2009-08-10 11:24:11 UTC (rev 17035)
+++ trunk/hibernatetools/tests/org.hibernate.eclipse.console.test/src/org/hibernate/eclipse/console/test/mappingproject/MappingTestsBase.java 2009-08-10 15:24:19 UTC (rev 17036)
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
package org.hibernate.eclipse.console.test.mappingproject;
import java.io.IOException;
@@ -24,6 +34,10 @@
import junit.framework.TestResult;
import junit.framework.TestSuite;
+/**
+ * @author Vitali Yemialyanchyk
+ *
+ */
@SuppressWarnings("restriction")
public abstract class MappingTestsBase extends TestCase {
16 years, 4 months
JBoss Tools SVN: r17035 - workspace.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2009-08-10 07:24:11 -0400 (Mon, 10 Aug 2009)
New Revision: 17035
Added:
workspace/yradtsevich/
Log:
Created a folder for Yahor Radtsevich's research work.
16 years, 4 months
JBoss Tools SVN: r17034 - trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2009-08-10 06:38:51 -0400 (Mon, 10 Aug 2009)
New Revision: 17034
Modified:
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizardPage.java
trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4737
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java 2009-08-08 01:13:30 UTC (rev 17033)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizard.java 2009-08-10 10:38:51 UTC (rev 17034)
@@ -62,7 +62,8 @@
prop.put("outputFileName", initPage.getFilename()); //$NON-NLS-1$
prop.put("format", "true"); //$NON-NLS-1$ //$NON-NLS-2$
prop.put("scriptToConsole", "false"); //$NON-NLS-1$ //$NON-NLS-2$
-
+ prop.put("exportToDatabase", "false");//$NON-NLS-1$ //$NON-NLS-2$
+
wc.setAttribute(HibernateJpaPlatformUi.full_exporter_id + ".properties", prop); //$NON-NLS-1$
wc.setAttribute(HibernateJpaPlatformUi.full_exporter_id + ".extension_id", HibernateLaunchConstants.ATTR_PREFIX + "hbm2ddl"); //$NON-NLS-1$ //$NON-NLS-2$
try {
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java 2009-08-08 01:13:30 UTC (rev 17033)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateDdlWizardPage.java 2009-08-10 10:38:51 UTC (rev 17034)
@@ -12,20 +12,10 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringDialogField;
import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.hibernate.eclipse.console.HibernateConsoleMessages;
-import org.hibernate.eclipse.console.utils.DialogSelectionHelper;
-import org.hibernate.eclipse.launch.PathHelper;
import org.hibernate.util.StringHelper;
/**
@@ -34,8 +24,6 @@
*/
public class GenerateDdlWizardPage extends GenerateInitWizardPage {
- private StringButtonDialogField outputdir;
-
private StringDialogField filename;
protected GenerateDdlWizardPage(JpaProject jpaProject) {
@@ -47,50 +35,16 @@
*/
@Override
protected void createChildControls(Composite container) {
- int numColumns = 3;
-
- IDialogFieldListener fieldlistener = new IDialogFieldListener() {
- public void dialogFieldChanged(DialogField field) {
- dialogChanged();
- }
- };
-
- outputdir = new StringButtonDialogField(new IStringButtonAdapter() {
- public void changeControlPressed(DialogField field) {
- IPath[] paths = DialogSelectionHelper.chooseFolderEntries(getShell(), PathHelper.pathOrNull(outputdir.getText()), HibernateConsoleMessages.CodeGenerationSettingsTab_select_output_dir, HibernateConsoleMessages.CodeGenerationSettingsTab_choose_dir_for_generated_files, false);
- if(paths!=null && paths.length==1) {
- outputdir.setText( ( (paths[0]).toOSString() ) );
- }
- }
- });
- outputdir.setText(getDefaultOutput());
- outputdir.setDialogFieldListener(fieldlistener);
- outputdir.setLabelText(HibernateConsoleMessages.CodeGenerationSettingsTab_output_dir);
- outputdir.setButtonLabel(HibernateConsoleMessages.CodeGenerationSettingsTab_browse);
-
- Control[] controls = outputdir.doFillIntoGrid(container, numColumns);
- // Hack to tell the text field to stretch!
- ( (GridData)controls[1].getLayoutData() ).grabExcessHorizontalSpace = true;
-
filename = new StringDialogField();
filename.setLabelText(Messages.GenerateDdlWizardPage_file_name);
filename.setText("schema.ddl"); //$NON-NLS-1$
filename.setDialogFieldListener(fieldlistener);
filename.doFillIntoGrid(container, numColumns);
-
- setPageComplete( false );
}
protected void dialogChanged() {
setErrorMessage(null);
setMessage(null);
- String msg = PathHelper.checkDirectory(getOutputDir(), HibernateConsoleMessages.CodeGenerationSettingsTab_output_directory, false);
-
- if (msg!=null) {
- setErrorMessage( msg );
- setPageComplete( false );
- return;
- }
if (StringHelper.isEmpty(getFilename())) {
setErrorMessage(Messages.GenerateDdlWizardPage_err_msg_input_file_name);
@@ -111,9 +65,7 @@
return filename.getText();
}
- public String getOutputDir(){
- return outputdir.getText();
- }
+
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizardPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizardPage.java 2009-08-08 01:13:30 UTC (rev 17033)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateEntitiesWizardPage.java 2009-08-10 10:38:51 UTC (rev 17034)
@@ -10,25 +10,18 @@
******************************************************************************/
package org.jboss.tools.hibernate.jpt.ui.wizard;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.jdt.core.JavaConventions;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.internal.corext.util.JavaConventionsUtil;
import org.eclipse.jdt.internal.corext.util.Messages;
import org.eclipse.jdt.internal.ui.wizards.NewWizardMessages;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IDialogFieldListener;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
-import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.StringDialogField;
import org.eclipse.jpt.core.JpaProject;
-import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
-import org.hibernate.eclipse.console.utils.DialogSelectionHelper;
import org.hibernate.eclipse.launch.PathHelper;
+import org.hibernate.util.StringHelper;
/**
* @author Dmitry Geraskov
@@ -36,8 +29,6 @@
*/
public class GenerateEntitiesWizardPage extends GenerateInitWizardPage {
- private StringButtonDialogField outputdir;
-
private StringDialogField packageName;
/**
@@ -52,37 +43,10 @@
*/
@Override
protected void createChildControls(Composite container) {
- int numColumns = 3;
-
- IDialogFieldListener fieldlistener = new IDialogFieldListener() {
- public void dialogFieldChanged(DialogField field) {
- dialogChanged();
- }
- };
-
- outputdir = new StringButtonDialogField(new IStringButtonAdapter() {
- public void changeControlPressed(DialogField field) {
- IPath[] paths = DialogSelectionHelper.chooseFolderEntries(getShell(), PathHelper.pathOrNull(outputdir.getText()), HibernateConsoleMessages.CodeGenerationSettingsTab_select_output_dir, HibernateConsoleMessages.CodeGenerationSettingsTab_choose_dir_for_generated_files, false);
- if(paths!=null && paths.length==1) {
- outputdir.setText( ( (paths[0]).toOSString() ) );
- }
- }
- });
- outputdir.setText(getDefaultOutput());
- outputdir.setDialogFieldListener(fieldlistener);
- outputdir.setLabelText(HibernateConsoleMessages.CodeGenerationSettingsTab_output_dir);
- outputdir.setButtonLabel(HibernateConsoleMessages.CodeGenerationSettingsTab_browse);
-
- Control[] controls = outputdir.doFillIntoGrid(container, numColumns);
- // Hack to tell the text field to stretch!
- ( (GridData)controls[1].getLayoutData() ).grabExcessHorizontalSpace = true;
-
packageName = new StringDialogField();
packageName.setDialogFieldListener(fieldlistener);
packageName.setLabelText(HibernateConsoleMessages.CodeGenerationSettingsTab_package);
- packageName.doFillIntoGrid(container, numColumns);
-
- setPageComplete( false );
+ packageName.doFillIntoGrid(container, numColumns);
}
@@ -125,9 +89,5 @@
public String getPackageName(){
return packageName.getText();
}
-
- public String getOutputDir(){
- return outputdir.getText();
- }
}
Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java
===================================================================
--- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2009-08-08 01:13:30 UTC (rev 17033)
+++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/wizard/GenerateInitWizardPage.java 2009-08-10 10:38:51 UTC (rev 17034)
@@ -45,7 +45,9 @@
import org.hibernate.console.preferences.ConsoleConfigurationPreferences.ConfigurationMode;
import org.hibernate.eclipse.console.EclipseConsoleConfigurationPreferences;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
+import org.hibernate.eclipse.console.utils.DialogSelectionHelper;
import org.hibernate.eclipse.console.utils.DriverClassHelpers;
+import org.hibernate.eclipse.launch.PathHelper;
import org.hibernate.tool.hbm2x.StringUtils;
import org.hibernate.util.StringHelper;
import org.jboss.tools.hibernate.jpt.core.internal.HibernateJptPlugin;
@@ -61,6 +63,8 @@
private DriverClassHelpers helper = new DriverClassHelpers();
+ private StringButtonDialogField outputdir;
+
private ComboDialogField connectionProfileName;
private StringButtonDialogField schemaName;
@@ -75,7 +79,9 @@
private JpaProject jpaProject;
- private IDialogFieldListener fieldlistener = new IDialogFieldListener() {
+ protected int numColumns = 3;
+
+ protected IDialogFieldListener fieldlistener = new IDialogFieldListener() {
public void dialogFieldChanged(DialogField field) {
dialogChanged();
}
@@ -92,19 +98,35 @@
*/
public void createControl(Composite parent) {
Composite container = new Composite(parent, SWT.NULL);
- GridLayout layout = new GridLayout();
- int numColumns = 3;
+ GridLayout layout = new GridLayout();
container.setLayout(layout);
layout.numColumns = numColumns;
layout.verticalSpacing = 10;
+ outputdir = new StringButtonDialogField(new IStringButtonAdapter() {
+ public void changeControlPressed(DialogField field) {
+ IPath[] paths = DialogSelectionHelper.chooseFolderEntries(getShell(), PathHelper.pathOrNull(outputdir.getText()), HibernateConsoleMessages.CodeGenerationSettingsTab_select_output_dir, HibernateConsoleMessages.CodeGenerationSettingsTab_choose_dir_for_generated_files, false);
+ if(paths!=null && paths.length==1) {
+ outputdir.setText( ( (paths[0]).toOSString() ) );
+ }
+ }
+ });
+ outputdir.setText(getDefaultOutput());
+ outputdir.setDialogFieldListener(fieldlistener);
+ outputdir.setLabelText(HibernateConsoleMessages.CodeGenerationSettingsTab_output_dir);
+ outputdir.setButtonLabel(HibernateConsoleMessages.CodeGenerationSettingsTab_browse);
+
+ Control[] controls = outputdir.doFillIntoGrid(container, numColumns);
+ // Hack to tell the text field to stretch!
+ ( (GridData)controls[1].getLayoutData() ).grabExcessHorizontalSpace = true;
+ setPageComplete(!StringHelper.isEmpty(getOutputDir()));
+
createChildControls(container);
selectMethod = new Button(container, SWT.CHECK);
selectMethod.setText(Messages.GenerateInitWizardPage_use_console_configuration);
selectMethod.setSelection(true);
- //selectMethod.setEnabled(false);
selectMethod.addSelectionListener(new SelectionListener(){
public void widgetDefaultSelected(SelectionEvent e) {
@@ -138,6 +160,10 @@
createDBGroup(container, numColumns);
setControl(container);
+
+ if (StringHelper.isEmpty(consoleConfigurationName.getText())) {
+ setPageComplete(false);
+ }
}
/**
@@ -199,8 +225,16 @@
}
- protected void dialogChanged() {
+ protected void dialogChanged() {
+ String msg = PathHelper.checkDirectory(getOutputDir(), HibernateConsoleMessages.CodeGenerationSettingsTab_output_directory, false);
+
+ if (msg!=null) {
+ setErrorMessage( msg );
+ setPageComplete( false );
+ return;
+ }
+
if (selectMethod.getSelection() && (StringHelper.isEmpty(getConfigurationName()))){
setPageComplete(false);
setErrorMessage(Messages.GenerateInitWizardPage_err_msg_select_console_configuration);
@@ -215,6 +249,10 @@
setPageComplete(true);
}
+ public String getOutputDir(){
+ return outputdir.getText();
+ }
+
private String[] dtpConnectionProfileNames() {
List<String> list = new ArrayList<String>();
16 years, 4 months
JBoss Tools SVN: r17033 - in trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam: internal/core/project/facet and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-08-07 21:13:30 -0400 (Fri, 07 Aug 2009)
New Revision: 17033
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4711 validation removed for upper case in seam project name
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java 2009-08-08 01:12:19 UTC (rev 17032)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java 2009-08-08 01:13:30 UTC (rev 17033)
@@ -36,7 +36,6 @@
public static String SEAM_FACET_INSTALL_ABSTRACT_DELEGATE_ERRORS_OCCURED;
public static String SEAM_FACET_INSTALL_ABSTRACT_DELEGATE_CHECK_ERROR_LOG_VIEW;
public static String SEAM_FACET_INSTALL_ABSTRACT_DELEGATE_ERROR;
- public static String SEAM_INSTALL_WIZARD_PROJECT_NAME_WITH_UPPERCASE;
public static String SeamFacetAbstractInstallDelegate_Could_not_activate_Hibernate_nature_on_project;
public static String SeamFacetAbstractInstallDelegate_Could_not_save_changes_to_preferences;
public static String SeamFacetAbstractInstallDelegate_Error;
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties 2009-08-08 01:12:19 UTC (rev 17032)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties 2009-08-08 01:13:30 UTC (rev 17033)
@@ -38,5 +38,4 @@
SEAM_RENAME_PROCESSOR_LOCATION_NOT_FOUND=Location for declaration or annotation not found in file: ''{0}''
SEAM_RENAME_PROCESSOR_DECLARATION_NOT_FOUND=Component: ''{0}'' does not have any declarations
SEAM_RENAME_PROCESSOR_ERROR_PHANTOM_FILE=Cannot change phantom file: ''{0}''.
-SEAM_RENAME_PROCESSOR_ERROR_READ_ONLY_FILE=Cannot change read-only file: ''{0}''.
-SEAM_INSTALL_WIZARD_PROJECT_NAME_WITH_UPPERCASE=Project names which start with a capital letter may break Seam/JSF applications; use lower case.
\ No newline at end of file
+SEAM_RENAME_PROCESSOR_ERROR_READ_ONLY_FILE=Cannot change read-only file: ''{0}''.
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java 2009-08-08 01:12:19 UTC (rev 17032)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java 2009-08-08 01:13:30 UTC (rev 17033)
@@ -208,16 +208,6 @@
return OK_STATUS;
}
- public static IStatus validateUpperCaseInProjectName(String projectName) {
- if(projectName!=null && projectName.length()>0) {
- char firstLetter = projectName.charAt(0);
- if(Character.isUpperCase(firstLetter)) {
- return new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamCoreMessages.SEAM_INSTALL_WIZARD_PROJECT_NAME_WITH_UPPERCASE);
- }
- }
- return OK_STATUS;
- }
-
private IStatus validateServer(Object serverObject) {
if (serverObject == null) {
return SeamCorePlugin.createErrorStatus(SeamCoreMessages.ERROR_JBOSS_AS_TARGET_SERVER_IS_EMPTY, null);
16 years, 4 months
JBoss Tools SVN: r17032 - in branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam: internal/core/project/facet and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-08-07 21:12:19 -0400 (Fri, 07 Aug 2009)
New Revision: 17032
Modified:
branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java
branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties
branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4711 validation removed for upper case in seam project name
Modified: branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java
===================================================================
--- branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java 2009-08-08 01:00:15 UTC (rev 17031)
+++ branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamCoreMessages.java 2009-08-08 01:12:19 UTC (rev 17032)
@@ -38,7 +38,6 @@
public static String SEAM_FACET_INSTALL_ABSTRACT_DELEGATE_ERRORS_OCCURED;
public static String SEAM_FACET_INSTALL_ABSTRACT_DELEGATE_CHECK_ERROR_LOG_VIEW;
public static String SEAM_FACET_INSTALL_ABSTRACT_DELEGATE_ERROR;
- public static String SEAM_INSTALL_WIZARD_PROJECT_NAME_WITH_UPPERCASE;
public static String SeamFacetAbstractInstallDelegate_Could_not_activate_Hibernate_nature_on_project;
public static String SeamFacetAbstractInstallDelegate_Could_not_save_changes_to_preferences;
public static String SeamFacetAbstractInstallDelegate_Error;
Modified: branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties
===================================================================
--- branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties 2009-08-08 01:00:15 UTC (rev 17031)
+++ branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/messages.properties 2009-08-08 01:12:19 UTC (rev 17032)
@@ -30,5 +30,4 @@
ERROR_JBOSS_AS_TARGET_SERVER_NO_SERVERS_DEFINED=There are no available Target Servers for selected Target Runtime
ERROR_JBOSS_AS_TARGET_SERVER_INCOMPATIBLE=Target Server is incompatible with Target Runtime selected
ERROR_JBOSS_AS_TARGET_RUNTIME_IS_EMPTY=Target Runtime cannot be empty
-ERROR_JBOSS_AS_TARGET_RUNTIME_UNKNOWN=Unknown Target Runtime
-SEAM_INSTALL_WIZARD_PROJECT_NAME_WITH_UPPERCASE=Project names which start with a capital letter may break Seam/JSF applications; use lower case.
\ No newline at end of file
+ERROR_JBOSS_AS_TARGET_RUNTIME_UNKNOWN=Unknown Target Runtime
\ No newline at end of file
Modified: branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java
===================================================================
--- branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java 2009-08-08 01:00:15 UTC (rev 17031)
+++ branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java 2009-08-08 01:12:19 UTC (rev 17032)
@@ -208,16 +208,6 @@
return OK_STATUS;
}
- public static IStatus validateUpperCaseInProjectName(String projectName) {
- if(projectName!=null && projectName.length()>0) {
- char firstLetter = projectName.charAt(0);
- if(Character.isUpperCase(firstLetter)) {
- return new Status(IStatus.WARNING, SeamCorePlugin.PLUGIN_ID, SeamCoreMessages.SEAM_INSTALL_WIZARD_PROJECT_NAME_WITH_UPPERCASE);
- }
- }
- return OK_STATUS;
- }
-
private IStatus validateServer(Object serverObject) {
if (serverObject == null) {
return SeamCorePlugin.createErrorStatus(SeamCoreMessages.ERROR_JBOSS_AS_TARGET_SERVER_IS_EMPTY, null);
16 years, 4 months
JBoss Tools SVN: r17031 - in trunk/seam/plugins: org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-08-07 21:00:15 -0400 (Fri, 07 Aug 2009)
New Revision: 17031
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4711 validation removed for upper case in seam project name
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java 2009-08-08 00:59:25 UTC (rev 17030)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java 2009-08-08 01:00:15 UTC (rev 17031)
@@ -205,13 +205,6 @@
if (!status.isOK())
return status;
}
- if(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME.equals(propertyName)) {
- String projectName = (String)model.getProperty(propertyName);
- status = validateUpperCaseInProjectName(projectName);
- if(!status.isOK()) {
- return status;
- }
- }
return OK_STATUS;
}
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 2009-08-08 00:59:25 UTC (rev 17030)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2009-08-08 01:00:15 UTC (rev 17031)
@@ -420,12 +420,6 @@
validatorDelegate.addValidatorForProperty(
ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
getDeploymentTypeValidator(getWizard()));
- if (!isNewSeamProjectWizard()) {
- validatorDelegate.addValidatorForProperty(
- IFacetDataModelProperties.FACET_PROJECT_NAME,
- new ProjectNameValidator(
- IFacetDataModelProperties.FACET_PROJECT_NAME));
- }
}
jBossHibernateDbTypeEditor
@@ -613,27 +607,6 @@
}
- class ProjectNameValidator implements IValidator {
- String propertyName;
-
- public ProjectNameValidator(String propertyName) {
- this.propertyName = propertyName;
- }
-
- public Map<String, IStatus> validate(Object value, Object context) {
- if (value == null) {
- return ValidatorFactory.NO_ERRORS;
- }
- final String projectName = (String) value;
- IStatus status = SeamFacetProjectCreationDataModelProvider
- .validateUpperCaseInProjectName(projectName);
- if (!status.isOK()) {
- return ValidatorFactory.createErrormessage(propertyName, status);
- }
- return ValidatorFactory.NO_ERRORS;
- }
- }
-
class ProjectNamesDuplicationValidator implements IValidator {
String propertyName;
16 years, 4 months
JBoss Tools SVN: r17030 - in branches/jbosstools-3.0.x/seam/plugins: org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-08-07 20:59:25 -0400 (Fri, 07 Aug 2009)
New Revision: 17030
Modified:
branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java
branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4711 validation removed for upper case in seam project name
Modified: branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java
===================================================================
--- branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java 2009-08-08 00:29:44 UTC (rev 17029)
+++ branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetProjectCreationDataModelProvider.java 2009-08-08 00:59:25 UTC (rev 17030)
@@ -205,13 +205,6 @@
if (!status.isOK())
return status;
}
- if(ISeamFacetDataModelProperties.SEAM_PROJECT_NAME.equals(propertyName)) {
- String projectName = (String)model.getProperty(propertyName);
- status = validateUpperCaseInProjectName(projectName);
- if(!status.isOK()) {
- return status;
- }
- }
return OK_STATUS;
}
Modified: branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java
===================================================================
--- branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2009-08-08 00:29:44 UTC (rev 17029)
+++ branches/jbosstools-3.0.x/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/internal/project/facet/SeamInstallWizardPage.java 2009-08-08 00:59:25 UTC (rev 17030)
@@ -419,12 +419,6 @@
validatorDelegate.addValidatorForProperty(
ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,
getDeploymentTypeValidator(getWizard()));
- if (!isNewSeamProjectWizard()) {
- validatorDelegate.addValidatorForProperty(
- IFacetDataModelProperties.FACET_PROJECT_NAME,
- new ProjectNameValidator(
- IFacetDataModelProperties.FACET_PROJECT_NAME));
- }
}
jBossHibernateDbTypeEditor
@@ -625,28 +619,6 @@
}
}
- class ProjectNameValidator implements IValidator {
- String propertyName;
-
- public ProjectNameValidator(String propertyName) {
- this.propertyName = propertyName;
- }
-
- public Map<String, IStatus> validate(Object value, Object context) {
- if (value == null) {
- return ValidatorFactory.NO_ERRORS;
- }
- final String projectName = (String) value;
- IStatus status = SeamFacetProjectCreationDataModelProvider
- .validateUpperCaseInProjectName(projectName);
- if (!status.isOK()) {
- return ValidatorFactory
- .createErrormessage(propertyName, status);
- }
- return ValidatorFactory.NO_ERRORS;
- }
- }
-
class ProjectNamesDuplicationValidator implements IValidator {
String propertyName;
16 years, 4 months