Author: vyemialyanchyk Date: 2009-07-10 06:17:50 -0400 (Fri, 10 Jul 2009) New Revision: 16527 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.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/model/OrmDiagram.java Log: https://jira.jboss.org/jira/browse/JBIDE-4285 - fixed Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java 2009-07-10 09:25:53 UTC (rev 16526) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenMappingAction.java 2009-07-10 10:17:50 UTC (rev 16527) @@ -97,18 +97,19 @@ return run(consoleConfig, propertySel, parentProp); } } - return run(consoleConfig, path.getLastSegment()); + return run(consoleConfig, path.getLastSegment(), null); } /** * @param consoleConfig * @param selection + * @param selectionParent * @throws JavaModelException * @throws PartInitException * @throws PresistanceClassNotFoundException * @throws FileNotFoundException */ - public static IEditorPart run(ConsoleConfiguration consoleConfig, Object selection) throws PartInitException, JavaModelException, FileNotFoundException { + public static IEditorPart run(ConsoleConfiguration consoleConfig, Object selection, Object selectionParent) throws PartInitException, JavaModelException, FileNotFoundException { IEditorPart editorPart = null; IFile file = null; if (selection instanceof Property) { @@ -116,16 +117,22 @@ if (p.getPersistentClass() != null) { //use PersistentClass to open editor file = OpenMappingUtils.searchFileToOpen(consoleConfig, p.getPersistentClass()); - //editorPart = openMapping(p.getPersistentClass(), consoleConfig); } } else { - file = OpenMappingUtils.searchFileToOpen(consoleConfig, selection); - //editorPart = openMapping(selection, consoleConfig); + if (selectionParent != null) { + file = OpenMappingUtils.searchFileToOpen(consoleConfig, selectionParent); + } else { + file = OpenMappingUtils.searchFileToOpen(consoleConfig, selection); + } } if (file != null) { editorPart = OpenMappingUtils.openFileInEditor(file); - updateEditorSelection(editorPart, selection); + boolean updateRes = updateEditorSelection(editorPart, selection); + if (!updateRes && selectionParent != null) { + // if it is not possible to select object, try to select it's child + updateRes = updateEditorSelection(editorPart, selectionParent); + } } if (editorPart == null) { //try to find hibernate-annotations Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java 2009-07-10 09:25:53 UTC (rev 16526) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/OpenSourceAction.java 2009-07-10 10:17:50 UTC (rev 16527) @@ -38,6 +38,7 @@ * @author Dmitry Geraskov */ +@SuppressWarnings("restriction") public class OpenSourceAction extends SelectionListenerAction { private String imageFilePath = "icons/images/java.gif"; //$NON-NLS-1$ Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java 2009-07-10 09:25:53 UTC (rev 16526) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java 2009-07-10 10:17:50 UTC (rev 16527) @@ -50,6 +50,7 @@ import org.hibernate.eclipse.console.HibernateConsoleMessages; import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.hibernate.mapping.Collection; +import org.hibernate.mapping.Column; import org.hibernate.mapping.Component; import org.hibernate.mapping.ManyToOne; import org.hibernate.mapping.Map; @@ -89,10 +90,16 @@ public static final String HIBERNATE_TAG_RESOURCE = "resource"; //$NON-NLS-1$ public static final String HIBERNATE_TAG_CATALOG = "catalog"; //$NON-NLS-1$ public static final String HIBERNATE_TAG_SCHEMA = "schema"; //$NON-NLS-1$ + public static final String HIBERNATE_TAG_KEY = "key"; //$NON-NLS-1$ + public static final String HIBERNATE_TAG_MANY2ONE = "many-to-one"; //$NON-NLS-1$ + public static final String HIBERNATE_TAG_PROPERTY = "property"; //$NON-NLS-1$ public static final String EJB_TAG_ENTITY = "entity"; //$NON-NLS-1$ public static final String EJB_TAG_CLASS = "class"; //$NON-NLS-1$ public static final String EJB_TAG_MAPPED_SUPERCLASS = "mapped-superclass"; //$NON-NLS-1$ - + public static final String EJB_TAG_COLUMN = "column"; //$NON-NLS-1$ + public static final String EJB_TAG_ID = "id"; //$NON-NLS-1$ + public static final String EJB_TAG_BASIC = "basic"; //$NON-NLS-1$ + //prohibit constructor call private OpenMappingUtils() {} @@ -234,6 +241,7 @@ * @param table * @return */ + @SuppressWarnings("unchecked") public static boolean tableInFile(ConsoleConfiguration consoleConfig, IFile file, Table table) { EntityResolver entityResolver = consoleConfig.getConfiguration().getEntityResolver(); Document doc = getDocument(file.getLocation().toFile(), entityResolver); @@ -274,6 +282,34 @@ if (!res && getElements(doc, HIBERNATE_TAG_TABLE, table.getName()).hasNext()) { res = true; } + if (!res) { + classes = getElements(doc, EJB_TAG_ENTITY); + while (classes.hasNext() && !res) { + Element element = classes.next(); + Iterator<Element> itTables = element.elements(HIBERNATE_TAG_TABLE).iterator(); + while (itTables.hasNext()) { + element = itTables.next(); + Attribute tableAttr = element.attribute(HIBERNATE_TAG_NAME); + if (tableAttr != null) { + Attribute catalogAttr = element.attribute(HIBERNATE_TAG_CATALOG); + if (catalogAttr == null) { + catalogAttr = doc.getRootElement().attribute(HIBERNATE_TAG_CATALOG); + } + Attribute schemaAttr = element.attribute(HIBERNATE_TAG_SCHEMA); + if (schemaAttr == null) { + schemaAttr = doc.getRootElement().attribute(HIBERNATE_TAG_SCHEMA); + } + String catalog = catalogAttr != null ? catalogAttr.getValue() : null; + String schema = schemaAttr != null ? schemaAttr.getValue() : null; + String name = tableAttr.getValue(); + if (getTableName(catalog, schema, name).equals(getTableName(table))) { + res = true; + break; + } + } + } + } + } return res; } @@ -632,6 +668,10 @@ selectRegion = findSelectRegion(proj, findAdapter, (PersistentClass)selection); } else if (selection instanceof Property){ selectRegion = findSelectRegion(proj, findAdapter, (Property)selection); + } else if (selection instanceof Table) { + selectRegion = findSelectRegion(proj, findAdapter, (Table)selection); + } else if (selection instanceof Column) { + selectRegion = findSelectRegion(proj, findAdapter, (Column)selection); } return selectRegion; } @@ -753,6 +793,58 @@ } return res; } + + /** + * Finds a document region, which corresponds of given persistent class. + * @param proj + * @param findAdapter + * @param table + * @return a proper document region + */ + public static IRegion findSelectRegion(IJavaProject proj, FindReplaceDocumentAdapter findAdapter, Table table) { + IRegion res = null; + String[] tablePatterns = generateTablePatterns(table.getName()); + IRegion tableRegion = null; + try { + for (int i = 0; (tableRegion == null) && (i < tablePatterns.length); i++){ + tableRegion = findAdapter.find(0, tablePatterns[i], true, true, false, true); + } + } catch (BadLocationException e) { + //ignore + } + if (tableRegion != null) { + int length = table.getName().length(); + int offset = tableRegion.getOffset() + tableRegion.getLength() - length - 1; + res = new Region(offset, length); + } + return res; + } + + /** + * Finds a document region, which corresponds of given persistent class. + * @param proj + * @param findAdapter + * @param table + * @return a proper document region + */ + public static IRegion findSelectRegion(IJavaProject proj, FindReplaceDocumentAdapter findAdapter, Column column) { + IRegion res = null; + String[] columnPatterns = generateColumnPatterns(column.getName()); + IRegion columnRegion = null; + try { + for (int i = 0; (columnRegion == null) && (i < columnPatterns.length); i++){ + columnRegion = findAdapter.find(0, columnPatterns[i], true, true, false, true); + } + } catch (BadLocationException e) { + //ignore + } + if (columnRegion != null) { + int length = column.getName().length(); + int offset = columnRegion.getOffset() + columnRegion.getLength() - length - 1; + res = new Region(offset, length); + } + return res; + } /** * Creates a xml tag search pattern with given tag name which should contains @@ -782,6 +874,25 @@ { EJB_TAG_MAPPED_SUPERCLASS, HIBERNATE_TAG_NAME, }, { EJB_TAG_MAPPED_SUPERCLASS, EJB_TAG_CLASS, }, }; + + private static String[][] tablePairs = { + { HIBERNATE_TAG_TABLE, HIBERNATE_TAG_NAME, }, + { HIBERNATE_TAG_CLASS, HIBERNATE_TAG_NAME, }, + { HIBERNATE_TAG_CLASS, HIBERNATE_TAG_ENTITY_NAME, }, + { EJB_TAG_ENTITY, HIBERNATE_TAG_NAME, }, + { EJB_TAG_ENTITY, EJB_TAG_CLASS, }, + }; + + private static String[][] columnPairs = { + { EJB_TAG_COLUMN, HIBERNATE_TAG_NAME, }, + { EJB_TAG_ID, EJB_TAG_COLUMN, }, + { HIBERNATE_TAG_MANY2ONE, EJB_TAG_COLUMN, }, + { HIBERNATE_TAG_KEY, EJB_TAG_COLUMN, }, + { EJB_TAG_ID, HIBERNATE_TAG_NAME, }, + { HIBERNATE_TAG_MANY2ONE, HIBERNATE_TAG_NAME, }, + { EJB_TAG_BASIC, HIBERNATE_TAG_NAME, }, + { HIBERNATE_TAG_PROPERTY, HIBERNATE_TAG_NAME, }, + }; /** * Extract short name of the class from fullClassName. @@ -837,6 +948,34 @@ } /** + * Generates a table xml tag search patterns. + * + * @param tableName + * @return an arrays of search patterns + */ + public static String[] generateTablePatterns(String tableName) { + List<String> patterns = new ArrayList<String>(); + for (int i = 0; i < tablePairs.length; i++) { + patterns.add(createPattern(tablePairs[i][0], tablePairs[i][1], tableName)); + } + return patterns.toArray(new String[0]); + } + + /** + * Generates a column xml tag search patterns. + * + * @param columnName + * @return an arrays of search patterns + */ + public static String[] generateColumnPatterns(String columnName) { + List<String> patterns = new ArrayList<String>(); + for (int i = 0; i < columnPairs.length; i++) { + patterns.add(createPattern(columnPairs[i][0], columnPairs[i][1], columnName)); + } + return patterns.toArray(new String[0]); + } + + /** * Generates a property xml tag search pattern, which corresponds hibernate hbm syntax. * * @param property Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java 2009-07-10 09:25:53 UTC (rev 16526) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/DiagramViewer.java 2009-07-10 10:17:50 UTC (rev 16527) @@ -171,39 +171,20 @@ return super.getAdapter(type); } - public Set<Object> getSelectedElements() { - Set<Object> ret = new HashSet<Object>(); + public Set<Shape> getSelectedElements() { + Set<Shape> ret = new HashSet<Shape>(); List<?> selectedEditParts = getGraphicalViewer().getSelectedEditParts(); Iterator<?> iterator = selectedEditParts.iterator(); while (iterator.hasNext()) { Object elem = iterator.next(); if (elem instanceof OrmEditPart) { Shape shape = (Shape)((OrmEditPart)elem).getModel(); - Object ormElement = shape.getOrmElement(); - if (ormElement instanceof Column){ - shape = (Shape) shape.getParent(); - } - ret.add(shape.getOrmElement()); + ret.add(shape); } } return ret; } - public Set<Object> getSelectedElements2() { - Set<Object> ret = new HashSet<Object>(); - List<?> selectedEditParts = getGraphicalViewer().getSelectedEditParts(); - Iterator<?> iterator = selectedEditParts.iterator(); - while (iterator.hasNext()) { - Object elem = iterator.next(); - if (elem instanceof OrmEditPart) { - Shape shape = (Shape)((OrmEditPart)elem).getModel(); - Object ormElement = shape.getOrmElement(); - ret.add(ormElement); - } - } - return ret; - } - public OrmDiagram getViewerContents() { return ormDiagram; } 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-07-10 09:25:53 UTC (rev 16526) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenMappingAction.java 2009-07-10 10:17:50 UTC (rev 16527) @@ -16,14 +16,17 @@ import org.eclipse.gef.ui.actions.SelectionAction; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PartInitException; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.eclipse.console.HibernateConsolePlugin; +import org.hibernate.mapping.Column; import org.hibernate.mapping.Property; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.UiPlugin; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; +import org.jboss.tools.hibernate.ui.diagram.editors.model.Shape; import org.jboss.tools.hibernate.ui.diagram.editors.model.SpecialRootClass; import org.jboss.tools.hibernate.ui.view.ObjectEditorInput; @@ -46,18 +49,20 @@ ConsoleConfiguration consoleConfig = objectEditorInput.getConfiguration(); DiagramViewer part = (DiagramViewer)getWorkbenchPart(); - //Set selectedElements = part.getSelectedElements(); - Set<Object> selectedElements = part.getSelectedElements2(); + Set<Shape> selectedElements = part.getSelectedElements(); - Iterator<Object> iterator = selectedElements.iterator(); - while (iterator.hasNext()) { - Object selection = iterator.next(); + IEditorPart editorPart = null; + Iterator<Shape> iterator = selectedElements.iterator(); + // open only first editor - no sense to open all of them + while (iterator.hasNext() && editorPart == null) { + Shape shape = iterator.next(); + Object selection = shape.getOrmElement(); if (selection instanceof Property && ((Property)selection).getPersistentClass() instanceof SpecialRootClass){ Property compositSel = ((Property)selection); - Property parentProperty = ((SpecialRootClass)((Property)selection).getPersistentClass()).getProperty(); + Property parentProperty = ((SpecialRootClass)compositSel.getPersistentClass()).getProperty(); try { - org.hibernate.eclipse.console.actions.OpenMappingAction.run(consoleConfig, compositSel, parentProperty); + editorPart = org.hibernate.eclipse.console.actions.OpenMappingAction.run(consoleConfig, compositSel, parentProperty); } catch (PartInitException e) { HibernateConsolePlugin.getDefault().logErrorMessage(DiagramViewerMessages.OpenMappingAction_canot_find_or_open_mapping_file, e); } catch (JavaModelException e) { @@ -70,8 +75,14 @@ if (selection instanceof SpecialRootClass) { selection = ((SpecialRootClass)selection).getProperty(); } + Shape shapeParent = null; + Object selectionParent = null; + if (selection instanceof Column){ + shapeParent = (Shape)shape.getParent(); + selectionParent = shapeParent.getOrmElement(); + } try { - org.hibernate.eclipse.console.actions.OpenMappingAction.run(consoleConfig, selection); + editorPart = org.hibernate.eclipse.console.actions.OpenMappingAction.run(consoleConfig, selection, selectionParent); } catch (PartInitException e) { HibernateConsolePlugin.getDefault().logErrorMessage(DiagramViewerMessages.OpenMappingAction_open_mapping_file, e); } catch (JavaModelException e) { 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-07-10 09:25:53 UTC (rev 16526) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java 2009-07-10 10:17:50 UTC (rev 16527) @@ -4,18 +4,22 @@ import java.util.Iterator; import java.util.Set; -import org.eclipse.core.resources.IResource; import org.eclipse.gef.ui.actions.SelectionAction; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PartInitException; import org.hibernate.console.ConsoleConfiguration; import org.hibernate.eclipse.console.HibernateConsolePlugin; +import org.hibernate.mapping.Column; import org.hibernate.mapping.PersistentClass; import org.hibernate.mapping.Property; +import org.hibernate.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.UiPlugin; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; +import org.jboss.tools.hibernate.ui.diagram.editors.model.Connection; +import org.jboss.tools.hibernate.ui.diagram.editors.model.Shape; import org.jboss.tools.hibernate.ui.view.ObjectEditorInput; /** @@ -37,12 +41,30 @@ ConsoleConfiguration consoleConfig = objectEditorInput.getConfiguration(); DiagramViewer part = (DiagramViewer)getWorkbenchPart(); - Set selectedElements = part.getSelectedElements(); + Set<Shape> selectedElements = part.getSelectedElements(); - Iterator iterator = selectedElements.iterator(); - while (iterator.hasNext()) { - //PersistentClass rootClass = (PersistentClass) iterator.next(); - Object selection = iterator.next(); + IEditorPart editorPart = null; + Iterator<Shape> iterator = selectedElements.iterator(); + // open only first editor - no sense to open all of them + while (iterator.hasNext() && editorPart == null) { + Shape shape = iterator.next(); + Object selection = shape.getOrmElement(); + if (selection instanceof Column || selection instanceof Table) { + Iterator<Connection> targetConnections = shape.getTargetConnections().iterator(); + while (targetConnections.hasNext()) { + Connection connection = targetConnections.next(); + Shape sh1 = connection.getSource(); + Shape sh2 = connection.getTarget(); + if (shape == sh1 && sh2 != null) { + shape = sh2; + break; + } else if (shape == sh2 && sh1 != null) { + shape = sh1; + break; + } + } + selection = shape.getOrmElement(); + } PersistentClass rootClass = null; if (selection instanceof PersistentClass) { rootClass = (PersistentClass) selection; @@ -52,13 +74,12 @@ continue; } - IResource resource = null; String fullyQualifiedName = rootClass.getClassName();//HibernateUtils.getPersistentClassName(rootClass); /*if (fullyQualifiedName.indexOf("$") > 0) { fullyQualifiedName = fullyQualifiedName.substring(0, fullyQualifiedName.indexOf("$")); }*/ try { - new org.hibernate.eclipse.console.actions.OpenSourceAction().run(consoleConfig, selection, fullyQualifiedName); + editorPart = org.hibernate.eclipse.console.actions.OpenSourceAction.run(consoleConfig, selection, fullyQualifiedName); } catch (PartInitException e) { HibernateConsolePlugin.getDefault().logErrorMessage(DiagramViewerMessages.OpenSourceAction_canot_open_source_file, e); } catch (JavaModelException e) { @@ -72,16 +93,5 @@ protected boolean calculateEnabled() { DiagramViewer part = (DiagramViewer)getWorkbenchPart(); return part.getSelectedElements().size() > 0; - /** / - DiagramViewer part = (DiagramViewer)getWorkbenchPart(); - Set selectedElements = part.getSelectedElements(); - Iterator iterator = selectedElements.iterator(); - while (iterator.hasNext()) { - Object elem = iterator.next(); - if (elem instanceof PersistentClass - || elem instanceof Property) return true; - } - return false; - /**/ } } 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-07-10 09:25:53 UTC (rev 16526) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java 2009-07-10 10:17:50 UTC (rev 16527) @@ -861,7 +861,7 @@ } } - public void setState(Properties properties,Shape shape, boolean value) { + public void setState(Properties properties, Shape shape, boolean value) { setState(properties, getKey(shape) + ".state", value); //$NON-NLS-1$ }