[jbosstools-commits] JBoss Tools SVN: r15566 - in trunk/hibernatetools: plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model and 3 other directories.

Author: vyemialyanchyk Date: 2009-05-27 11:57:47 -0400 (Wed, 27 May 2009) New Revision: 15566 Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Shape.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/SpecialOrmShape.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ExpandeableShapeTreeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeTreeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ObjectEditorInput.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.veditor.test/src/org/jboss/tools/hibernate/ui/veditor/editors/model/test/OrmDiagramTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-4361 - refactoring -> javaProject should not be a member of OrmDiagram. Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java 2009-05-27 15:51:53 UTC (rev 15565) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/VisualEditor.java 2009-05-27 15:57:47 UTC (rev 15566) @@ -146,7 +146,7 @@ if (obj instanceof RootClass) { RootClass rootClass = (RootClass)obj; setPartName(UIVEditorMessages.VisualEditor_diagram_for + rootClass.getEntityName()); - ormDiagram = new OrmDiagram(configuration, rootClass, objectEditorInput.getJavaProject()); + ormDiagram = new OrmDiagram(configuration, rootClass); } else if (obj instanceof RootClass[]) { RootClass[] rootClasses = (RootClass[])obj; @@ -155,7 +155,7 @@ name += " & " + rootClasses[i].getEntityName(); //$NON-NLS-1$ } setPartName(UIVEditorMessages.VisualEditor_diagram_for + name); - ormDiagram = new OrmDiagram(configuration, rootClasses, objectEditorInput.getJavaProject()); + ormDiagram = new OrmDiagram(configuration, rootClasses); } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2009-05-27 15:51:53 UTC (rev 15565) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/OrmDiagram.java 2009-05-27 15:57:47 UTC (rev 15566) @@ -30,6 +30,7 @@ import org.eclipse.jdt.core.IJavaProject; import org.hibernate.cfg.Configuration; import org.hibernate.console.ConsoleConfiguration; +import org.hibernate.eclipse.console.utils.ProjectUtils; import org.hibernate.mapping.Collection; import org.hibernate.mapping.Column; import org.hibernate.mapping.Component; @@ -56,20 +57,16 @@ private String childrenLocations[]; private HashMap<String,OrmShape> elements = new HashMap<String,OrmShape>(); private RootClass[] ormElements; - private Configuration configuration; - private ConsoleConfiguration consoleConfiguration; - private IJavaProject javaProject; + private ConsoleConfiguration consoleConfig; private String[] entityNames; public static final String HIBERNATE_MAPPING_LAYOUT_FOLDER_NAME = "hibernateMapping"; //$NON-NLS-1$ - public OrmDiagram(ConsoleConfiguration configuration, RootClass ioe, IJavaProject javaProject) { - consoleConfiguration = configuration; - this.configuration = configuration.getConfiguration(); + public OrmDiagram(ConsoleConfiguration consoleConfig, RootClass ioe) { + this.consoleConfig = consoleConfig; ormElements = new RootClass[1]; ormElements[0] = ioe; entityNames = new String[1]; entityNames[0] = ioe.getEntityName(); - this.javaProject = javaProject; childrenLocations = new String[]{new String("")}; //$NON-NLS-1$ @@ -79,16 +76,14 @@ setDirty(false); } - public OrmDiagram(ConsoleConfiguration configuration, RootClass[] ioe, IJavaProject javaProject) { - consoleConfiguration = configuration; - this.configuration = configuration.getConfiguration(); + public OrmDiagram(ConsoleConfiguration consoleConfig, RootClass[] ioe) { + this.consoleConfig = consoleConfig; ormElements = new RootClass[ioe.length]; System.arraycopy(ioe, 0, ormElements, 0, ioe.length); entityNames = new String[ioe.length]; for (int i = 0; i < ormElements.length; i++) { entityNames[i] = ormElements[i].getEntityName(); } - this.javaProject = javaProject; childrenLocations = new String[]{new String("")}; //$NON-NLS-1$ for (int i = 0; i < ormElements.length; i++) { getOrCreatePersistentClass(ormElements[i], null); @@ -100,6 +95,7 @@ public IPath getStoreFolderPath() { IPath storePath = null; + IJavaProject javaProject = ProjectUtils.findJavaProject(consoleConfig); if (javaProject != null && javaProject.getProject() != null) { storePath = javaProject.getProject().getLocation(); } @@ -118,7 +114,7 @@ for (int i = 1; i < ormElements.length; i++) { name += "_" + ormElements[i].getClassName(); //$NON-NLS-1$ } - return consoleConfiguration.getName() + "_" + name; //$NON-NLS-1$ + return consoleConfig.getName() + "_" + name; //$NON-NLS-1$ } @SuppressWarnings("unchecked") @@ -139,9 +135,9 @@ public void refresh() { boolean bRefresh = false; + final Configuration config = consoleConfig.getConfiguration(); for (int i = 0; i < ormElements.length; i++) { - RootClass newOrmElement = (RootClass) consoleConfiguration - .getConfiguration().getClassMapping(entityNames[i]); + RootClass newOrmElement = (RootClass)config.getClassMapping(entityNames[i]); if (ormElements[i].equals(newOrmElement)) { continue; } @@ -352,7 +348,8 @@ tableShape = elements.get(tableName); if(tableShape == null) { tableShape = createShape(databaseTable); - Iterator iterator = getConfiguration().getClassMappings(); + final Configuration config = consoleConfig.getConfiguration(); + Iterator iterator = config.getClassMappings(); while (iterator.hasNext()) { Object clazz = iterator.next(); if (clazz instanceof RootClass) { @@ -440,7 +437,8 @@ Type type = ((Property)element).getType(); if (type.isEntityType()) { EntityType et = (EntityType) type; - Object clazz = getConfiguration().getClassMapping(et.getAssociatedEntityName()); + final Configuration config = consoleConfig.getConfiguration(); + Object clazz = config.getClassMapping(et.getAssociatedEntityName()); if (clazz instanceof RootClass) { RootClass rootClass = (RootClass)clazz; s = getOrCreatePersistentClass(rootClass, null); @@ -469,11 +467,6 @@ public void update(){ firePropertyChange(REFRESH, null, null); } - - protected Configuration getConfiguration() { - return configuration; - } - @SuppressWarnings("unchecked") protected void refreshComponentReferences(ComponentShape componentShape) { @@ -811,11 +804,7 @@ return getState(properties, getKey(shape)+".state"); //$NON-NLS-1$ } - public IJavaProject getJavaProject() { - return javaProject; + public ConsoleConfiguration getConsoleConfig() { + return consoleConfig; } - - public ConsoleConfiguration getConsoleConfiguration() { - return consoleConfiguration; - } } \ No newline at end of file Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Shape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Shape.java 2009-05-27 15:51:53 UTC (rev 15565) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/Shape.java 2009-05-27 15:57:47 UTC (rev 15566) @@ -186,7 +186,7 @@ return ((Property) getOrmElement()).getType().getReturnedClass().getName(); } else if (getOrmElement() instanceof Column) { - String type = ormModelNameVisitor.getColumnSqlType((Column) getOrmElement(), getOrmDiagram().getConsoleConfiguration()); + String type = ormModelNameVisitor.getColumnSqlType((Column) getOrmElement(), getOrmDiagram().getConsoleConfig()); Column column = (Column) getOrmElement(); StringBuffer name = new StringBuffer(); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/SpecialOrmShape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/SpecialOrmShape.java 2009-05-27 15:51:53 UTC (rev 15565) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/model/SpecialOrmShape.java 2009-05-27 15:57:47 UTC (rev 15566) @@ -16,7 +16,6 @@ import org.hibernate.console.execution.ExecutionContext.Command; import org.hibernate.mapping.Property; import org.hibernate.mapping.RootClass; -import org.hibernate.mapping.SimpleValue; import org.hibernate.type.Type; import org.jboss.tools.hibernate.ui.veditor.VisualEditorPlugin; @@ -47,7 +46,7 @@ try { Type type = null; if (getOrmDiagram() != null){ - ConsoleConfiguration cfg = getOrmDiagram().getConsoleConfiguration(); + ConsoleConfiguration cfg = getOrmDiagram().getConsoleConfig(); final Property fField = field; type = (Type) cfg.execute(new Command(){ public Object execute() { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ExpandeableShapeTreeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ExpandeableShapeTreeEditPart.java 2009-05-27 15:51:53 UTC (rev 15565) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ExpandeableShapeTreeEditPart.java 2009-05-27 15:57:47 UTC (rev 15566) @@ -62,7 +62,7 @@ Shape model = (Shape) getModel(); Object element = model.getOrmElement(); - ConsoleConfiguration cfg = model.getOrmDiagram().getConsoleConfiguration(); + ConsoleConfiguration cfg = model.getOrmDiagram().getConsoleConfig(); setWidgetImage(ormLabelProvider.getImage(element)); setWidgetText(ormLabelProvider.getText(element, cfg)); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeEditPart.java 2009-05-27 15:51:53 UTC (rev 15565) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeEditPart.java 2009-05-27 15:57:47 UTC (rev 15566) @@ -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.cfg.Configuration; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.mapping.Column; import org.hibernate.mapping.Component; @@ -39,7 +38,6 @@ import org.hibernate.mapping.OneToMany; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; -import org.hibernate.mapping.RootClass; import org.hibernate.mapping.SimpleValue; import org.hibernate.mapping.Table; import org.jboss.tools.hibernate.ui.veditor.editors.figures.TitleFigure; @@ -48,7 +46,6 @@ import org.jboss.tools.hibernate.ui.veditor.editors.model.ModelElement; import org.jboss.tools.hibernate.ui.veditor.editors.model.OrmDiagram; import org.jboss.tools.hibernate.ui.veditor.editors.model.Shape; -import org.jboss.tools.hibernate.ui.veditor.editors.model.SpecialRootClass; import org.jboss.tools.hibernate.ui.view.views.OrmLabelProvider; import org.jboss.tools.hibernate.ui.view.views.OrmModelImageVisitor; import org.jboss.tools.hibernate.ui.view.views.OrmModelNameVisitor; @@ -74,7 +71,7 @@ } ConsoleConfiguration cfg = null; if (model instanceof OrmDiagram) { - cfg = ((OrmDiagram) model).getConsoleConfiguration(); + cfg = ((OrmDiagram) model).getConsoleConfig(); } label.setText(ormLabelProvider.getText(getElement(), cfg)); label.setBackgroundColor(getColor()); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeTreeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeTreeEditPart.java 2009-05-27 15:51:53 UTC (rev 15565) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/veditor/editors/parts/ShapeTreeEditPart.java 2009-05-27 15:57:47 UTC (rev 15566) @@ -62,7 +62,7 @@ Shape model = (Shape) getModel(); Object element = model.getOrmElement(); - ConsoleConfiguration cfg = model.getOrmDiagram().getConsoleConfiguration(); + ConsoleConfiguration cfg = model.getOrmDiagram().getConsoleConfig(); setWidgetImage(ormLabelProvider.getImage(element)); setWidgetText(ormLabelProvider.getText(element, cfg)); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ObjectEditorInput.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ObjectEditorInput.java 2009-05-27 15:51:53 UTC (rev 15565) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/ObjectEditorInput.java 2009-05-27 15:57:47 UTC (rev 15566) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.hibernate.ui.view.views; -import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IPersistableElement; @@ -21,16 +20,14 @@ protected Object fObject; protected ConsoleConfiguration configuration; - protected IJavaProject javaProject; public ObjectEditorInput(Object object) { fObject = object; } - public ObjectEditorInput(ConsoleConfiguration configuration, Object object, IJavaProject proj) { + public ObjectEditorInput(ConsoleConfiguration configuration, Object object) { fObject = object; this.configuration = configuration; - javaProject = proj; } public Object getObject() { @@ -72,10 +69,6 @@ return configuration; } - public IJavaProject getJavaProject() { - return javaProject; - } - public boolean equals(Object obj) { return (obj instanceof ObjectEditorInput && ((ObjectEditorInput)obj).fObject == fObject); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java 2009-05-27 15:51:53 UTC (rev 15565) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/view/views/OpenDiagramActionDelegate.java 2009-05-27 15:57:47 UTC (rev 15566) @@ -66,12 +66,8 @@ public IEditorPart openEditor(PersistentClass persClass, ConsoleConfiguration consoleConfiguration) throws PartInitException { ObjectEditorInput input = hashMap.get(persClass.getRootClass()); - - - IJavaProject proj = ProjectUtils.findJavaProject(consoleConfiguration); - if(input == null) { - input = new ObjectEditorInput(consoleConfiguration, persClass.getRootClass(), proj); + input = new ObjectEditorInput(consoleConfiguration, persClass.getRootClass()); hashMap.put(persClass.getRootClass(), input); } @@ -93,12 +89,9 @@ id += "@" + persClass.toString(); //$NON-NLS-1$ rcArr[i++] = persClass.getRootClass(); } - ObjectEditorInput input = hashMap.get(id); - IJavaProject proj = ProjectUtils.findJavaProject(consoleConfiguration); - if (null == input) { - input = new ObjectEditorInput(consoleConfiguration, rcArr, proj); + input = new ObjectEditorInput(consoleConfiguration, rcArr); hashMap.put(id, input); } Modified: trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.veditor.test/src/org/jboss/tools/hibernate/ui/veditor/editors/model/test/OrmDiagramTest.java =================================================================== --- trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.veditor.test/src/org/jboss/tools/hibernate/ui/veditor/editors/model/test/OrmDiagramTest.java 2009-05-27 15:51:53 UTC (rev 15565) +++ trunk/hibernatetools/tests/org.jboss.tools.hibernate.ui.veditor.test/src/org/jboss/tools/hibernate/ui/veditor/editors/model/test/OrmDiagramTest.java 2009-05-27 15:57:47 UTC (rev 15566) @@ -43,8 +43,7 @@ public void testLoadAndSave() { - final ConsoleConfiguration consoleConfiguration = context.mock(ConsoleConfiguration.class); - final Configuration configuration = context.mock(Configuration.class); + final ConsoleConfiguration consoleConfig = context.mock(ConsoleConfiguration.class); final RootClass ioe = context.mock(RootClass.class); final IJavaProject javaProject = context.mock(IJavaProject.class); final List<Object> emptyList = new ArrayList<Object>(); @@ -53,9 +52,6 @@ context.checking(new Expectations() { { - oneOf(consoleConfiguration).getConfiguration(); - will(returnValue(configuration)); - oneOf(ioe).getEntityName(); will(returnValue("testEntityName")); //$NON-NLS-1$ @@ -95,14 +91,14 @@ allowing(ioe).getClassName(); will(returnValue("ClassName")); //$NON-NLS-1$ - allowing(consoleConfiguration).getName(); + allowing(consoleConfig).getName(); will(returnValue("CCName")); //$NON-NLS-1$ allowing(ioe).getEntityName(); will(returnValue("")); //$NON-NLS-1$ } }); - final OrmDiagram ormDiagram = new OrmDiagram(consoleConfiguration, ioe, javaProject); + final OrmDiagram ormDiagram = new OrmDiagram(consoleConfig, ioe); ormDiagram.save(); // test is the folder created File folder = new File(ormDiagram.getStoreFolderPath().toOSString());