May 2010 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r21954 - in branches/hibernatetools-multiversion/hibernatetools: plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils and 20 other directories.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2010-05-07 09:51:18 -0400 (Fri, 07 May 2010) New Revision: 21954 Added: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Collection.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/List.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Map.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Set.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Table.java Removed: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/CollectionStub.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ListStub.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/MapStub.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/SetStub.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/TableStub.java Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TableFilterView.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConfigurationAdapterFactory.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/IconNameValueVisitor.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PropertyWorkbenchAdapter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableWorkbenchAdapter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TypeNameValueVisitor.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/RelationalGraphView.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PropertyViewAdapter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/TableViewAdapter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/nature/HibernateNature.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/ColumnNameHandler.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/TableNameHandler.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/NodeFactory.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/TableNode.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/ConsoleQueryParameter.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/JDBCMetaDataConfiguration.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/reveng/DefaultDatabaseCollector.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/reveng/TableIdentifier.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Array.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Bag.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ForeignKey.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/IdentifierCollection.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/IndexedCollection.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/JoinedSubclass.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ManyToOne.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/OneToOne.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/PersistentClass.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/PrimaryKey.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/RootClass.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/SimpleValue.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Subclass.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Value.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ValueFactory.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ValueVisitor.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateTableComposite.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ShapeHideAction.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ShapeShowAction.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAction.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/ToggleShapeVisibleStateCommand.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ComponentShape.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Connection.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmShape.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialRootClass.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Utils.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ConnectionEditPart.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/HibernateUtils.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmImageMap.java branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelMap.java branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/hbmexporter/HbmExporterTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6070 - fix rest of stub names Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/NodeFactory.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/NodeFactory.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/NodeFactory.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -29,7 +29,7 @@ import org.hibernate.console.ConsoleMessages; import org.hibernate.console.ImageConstants; import org.hibernate.mediator.x.Session; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.hibernate.mediator.x.metadata.ClassMetadata; import org.hibernate.mediator.x.metadata.CollectionMetadata; import org.hibernate.mediator.x.type.CollectionType; @@ -180,7 +180,7 @@ return consoleConfig; } - public static TableNode createTableNode(BaseNode parent, TableStub table) { + public static TableNode createTableNode(BaseNode parent, Table table) { return new TableNode(parent, table); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/TableNode.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/TableNode.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/node/TableNode.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -21,11 +21,11 @@ */ package org.hibernate.console.node; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; public class TableNode extends BaseNode { - public TableNode(BaseNode parent, TableStub table) { + public TableNode(BaseNode parent, Table table) { super(null, parent); name = table.getName(); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/utils/OpenMappingUtils.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -52,18 +52,18 @@ import org.hibernate.mediator.stubs.util.OpenMappingUtilsEjb3; import org.hibernate.mediator.stubs.util.StringHelper; import org.hibernate.mediator.stubs.util.XMLHelper; -import org.hibernate.mediator.x.mapping.CollectionStub; +import org.hibernate.mediator.x.mapping.Collection; import org.hibernate.mediator.x.mapping.Column; import org.hibernate.mediator.x.mapping.Component; import org.hibernate.mediator.x.mapping.ManyToOne; -import org.hibernate.mediator.x.mapping.MapStub; +import org.hibernate.mediator.x.mapping.Map; import org.hibernate.mediator.x.mapping.OneToMany; import org.hibernate.mediator.x.mapping.OneToOne; import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.Property; import org.hibernate.mediator.x.mapping.RootClass; import org.hibernate.mediator.x.mapping.Subclass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.hibernate.mediator.x.mapping.ToOne; import org.hibernate.mediator.x.mapping.Value; import org.hibernate.mediator.x.tool.hbm2x.Cfg2HbmTool; @@ -132,7 +132,7 @@ * @param table * @return */ - public static String getTableName(TableStub table) { + public static String getTableName(Table table) { return getTableName(table.getCatalog(), table.getSchema(), table.getName()); } @@ -165,8 +165,8 @@ res = rootClassInFile(consoleConfig, file, (RootClass)element); } else if (element instanceof Subclass) { res = subclassInFile(consoleConfig, file, (Subclass)element); - } else if (element instanceof TableStub) { - res = tableInFile(consoleConfig, file, (TableStub)element); + } else if (element instanceof Table) { + res = tableInFile(consoleConfig, file, (Table)element); } return res; } @@ -243,7 +243,7 @@ * @return */ @SuppressWarnings("unchecked") - public static boolean tableInFile(ConsoleConfiguration consoleConfig, IFile file, TableStub table) { + public static boolean tableInFile(ConsoleConfiguration consoleConfig, IFile file, Table table) { EntityResolver entityResolver = consoleConfig.getEntityResolver(); Document doc = getDocument(file.getLocation().toFile(), entityResolver); Iterator<Element> classes = getElements(doc, HIBERNATE_TAG_CLASS); @@ -671,8 +671,8 @@ selectRegion = findSelectRegion(proj, findAdapter, (PersistentClass)selection); } else if (selection instanceof Property){ selectRegion = findSelectRegion(proj, findAdapter, (Property)selection); - } else if (selection instanceof TableStub) { - selectRegion = findSelectRegion(proj, findAdapter, (TableStub)selection); + } else if (selection instanceof Table) { + selectRegion = findSelectRegion(proj, findAdapter, (Table)selection); } else if (selection instanceof Column) { selectRegion = findSelectRegion(proj, findAdapter, (Column)selection); } @@ -804,7 +804,7 @@ * @param table * @return a proper document region */ - public static IRegion findSelectRegion(IJavaProject proj, FindReplaceDocumentAdapter findAdapter, TableStub table) { + public static IRegion findSelectRegion(IJavaProject proj, FindReplaceDocumentAdapter findAdapter, Table table) { IRegion res = null; String[] tablePatterns = generateTablePatterns(table.getName()); IRegion tableRegion = null; @@ -1022,8 +1022,8 @@ Value value = property.getValue(); toolTag = "basic"; //$NON-NLS-1$ if (!value.isSimpleValue()) { - if (value instanceof CollectionStub) { - value = ((CollectionStub)value).getElement(); + if (value instanceof Collection) { + value = ((Collection)value).getElement(); } } if (value instanceof OneToMany) { @@ -1036,7 +1036,7 @@ else if (value instanceof OneToOne) { toolTag = "one-to-one"; //$NON-NLS-1$ } - else if (value instanceof MapStub) { + else if (value instanceof Map) { toolTag = "many-to-many"; //$NON-NLS-1$ } else if (value instanceof Component) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TableFilterView.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TableFilterView.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/wizards/TableFilterView.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -34,7 +34,6 @@ import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; import org.hibernate.console.ConsoleConfiguration; @@ -48,7 +47,7 @@ import org.hibernate.eclipse.console.workbench.xpl.AnyAdaptableLabelProvider; import org.hibernate.mediator.stubs.util.StringHelper; import org.hibernate.mediator.x.mapping.Column; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; public abstract class TableFilterView extends TreeToTableComposite { @@ -141,8 +140,8 @@ Object sel = iterator.next(); ITableFilter filter = null; - if ( sel instanceof TableStub ) { - TableStub table = (TableStub) sel; + if ( sel instanceof Table ) { + Table table = (Table) sel; filter = revEngDef.createTableFilter(); if ( StringHelper.isNotEmpty( table.getName() ) ) { filter.setMatchName( table.getName() ); @@ -243,7 +242,7 @@ } } - protected void createTableColumns(Table table) { + protected void createTableColumns(org.eclipse.swt.widgets.Table table) { TableColumn column = new TableColumn(table, SWT.CENTER, 0); column.setText(HibernateConsoleMessages.TableFilterView_sign); column.setWidth(20); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConfigurationAdapterFactory.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConfigurationAdapterFactory.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConfigurationAdapterFactory.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -38,7 +38,7 @@ import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.PrimaryKey; import org.hibernate.mediator.x.mapping.Property; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.hibernate.mediator.x.mapping.Value; public class ConfigurationAdapterFactory implements IAdapterFactory { @@ -60,7 +60,7 @@ map.put(LazyDatabaseSchema.class, new LazyDatabaseSchemaWorkbenchAdapter()); map.put(LazySessionFactory.class, new LazySessionFactoryAdapter()); map.put(TableContainer.class, new TableContainerWorkbenchAdapter()); - map.put(TableStub.class, new TableWorkbenchAdapter()); + map.put(Table.class, new TableWorkbenchAdapter()); map.put(PrimaryKey.class, new PrimaryKeyWorkbenchAdapter()); map.put(Column.class, new ColumnWorkbenchAdapter()); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/IconNameValueVisitor.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/IconNameValueVisitor.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/IconNameValueVisitor.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -28,13 +28,13 @@ import org.hibernate.mediator.x.mapping.Component; import org.hibernate.mediator.x.mapping.DependantValue; import org.hibernate.mediator.x.mapping.IdentifierBag; -import org.hibernate.mediator.x.mapping.ListStub; +import org.hibernate.mediator.x.mapping.List; import org.hibernate.mediator.x.mapping.ManyToOne; -import org.hibernate.mediator.x.mapping.MapStub; +import org.hibernate.mediator.x.mapping.Map; import org.hibernate.mediator.x.mapping.OneToMany; import org.hibernate.mediator.x.mapping.OneToOne; import org.hibernate.mediator.x.mapping.PrimitiveArray; -import org.hibernate.mediator.x.mapping.SetStub; +import org.hibernate.mediator.x.mapping.Set; import org.hibernate.mediator.x.mapping.SimpleValue; import org.hibernate.mediator.x.mapping.ValueVisitor; @@ -64,7 +64,7 @@ return ImageConstants.PROPERTY; } - public Object accept(SetStub set) { + public Object accept(Set set) { return ImageConstants.MANYTOONE; } @@ -72,7 +72,7 @@ return ImageConstants.ONETOMANY; } - public Object accept(MapStub map) { + public Object accept(Map map) { return ImageConstants.MANYTOONE; } @@ -84,7 +84,7 @@ return ImageConstants.MANYTOONE; } - public Object accept(ListStub list) { + public Object accept(List list) { return ImageConstants.MANYTOONE; } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -43,7 +43,7 @@ import org.hibernate.mediator.x.cfg.reveng.JDBCReader; import org.hibernate.mediator.x.cfg.reveng.ReverseEngineeringStrategy; import org.hibernate.mediator.x.connection.ConnectionProvider; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; public class LazyDatabaseSchemaWorkbenchAdapter extends BasicWorkbenchAdapter { @@ -61,9 +61,9 @@ List<TableContainer> result = new ArrayList<TableContainer>(); - Iterator<Map.Entry<String, List<TableStub>>> qualifierEntries = db.getQualifierEntries(); + Iterator<Map.Entry<String, List<Table>>> qualifierEntries = db.getQualifierEntries(); while (qualifierEntries.hasNext()) { - Map.Entry<String, List<TableStub>> entry = qualifierEntries.next(); + Map.Entry<String, List<Table>> entry = qualifierEntries.next(); result.add(new TableContainer(entry.getKey(), entry.getValue())); } return toArray(result.iterator(), TableContainer.class, new Comparator<TableContainer>() { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PropertyWorkbenchAdapter.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PropertyWorkbenchAdapter.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PropertyWorkbenchAdapter.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -29,14 +29,14 @@ import org.hibernate.mediator.x.mapping.Component; import org.hibernate.mediator.x.mapping.DependantValue; import org.hibernate.mediator.x.mapping.IdentifierBag; -import org.hibernate.mediator.x.mapping.ListStub; +import org.hibernate.mediator.x.mapping.List; import org.hibernate.mediator.x.mapping.ManyToOne; -import org.hibernate.mediator.x.mapping.MapStub; +import org.hibernate.mediator.x.mapping.Map; import org.hibernate.mediator.x.mapping.OneToMany; import org.hibernate.mediator.x.mapping.OneToOne; import org.hibernate.mediator.x.mapping.PrimitiveArray; import org.hibernate.mediator.x.mapping.Property; -import org.hibernate.mediator.x.mapping.SetStub; +import org.hibernate.mediator.x.mapping.Set; import org.hibernate.mediator.x.mapping.SimpleValue; import org.hibernate.mediator.x.mapping.Value; import org.hibernate.mediator.x.mapping.ValueVisitor; @@ -73,7 +73,7 @@ return NO_CHILDREN; } - public Object accept(SetStub set) { + public Object accept(Set set) { return NO_CHILDREN; // should it look up the target entity? } @@ -81,7 +81,7 @@ return NO_CHILDREN; } - public Object accept(MapStub map) { + public Object accept(Map map) { return NO_CHILDREN; } @@ -93,7 +93,7 @@ return NO_CHILDREN; } - public Object accept(ListStub list) { + public Object accept(List list) { return NO_CHILDREN; } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainer.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -23,19 +23,19 @@ import java.util.List; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; public class TableContainer { - private final List<TableStub> tables; + private final List<Table> tables; private final String name; - public TableContainer(String name, List<TableStub> tables) { + public TableContainer(String name, List<Table> tables) { this.tables = tables; this.name = name; } - public List<TableStub> getTables() { + public List<Table> getTables() { return tables; } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -27,15 +27,15 @@ import org.hibernate.console.ImageConstants; import org.hibernate.eclipse.console.HibernateConsoleMessages; import org.hibernate.eclipse.console.utils.EclipseImages; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; public class TableContainerWorkbenchAdapter extends BasicWorkbenchAdapter { public Object[] getChildren(Object o) { TableContainer tc = getTableContainer( o ); - return toArray(tc.getTables().iterator(), TableStub.class, new Comparator<TableStub>() { + return toArray(tc.getTables().iterator(), Table.class, new Comparator<Table>() { - public int compare(TableStub arg0, TableStub arg1) { + public int compare(Table arg0, Table arg1) { return arg0.getName().compareTo(arg1.getName()); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableWorkbenchAdapter.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableWorkbenchAdapter.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableWorkbenchAdapter.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -30,12 +30,12 @@ import org.hibernate.eclipse.console.utils.EclipseImages; import org.hibernate.mediator.x.mapping.Column; import org.hibernate.mediator.x.mapping.PrimaryKey; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; public class TableWorkbenchAdapter extends BasicWorkbenchAdapter { public Object[] getChildren(Object o) { - TableStub t = getTable( o ); + Table t = getTable( o ); List<Object> items = new ArrayList<Object>(); @@ -55,8 +55,8 @@ return items.toArray(new Object[items.size()]); } - private TableStub getTable(Object o) { - return (TableStub) o; + private Table getTable(Object o) { + return (Table) o; } public ImageDescriptor getImageDescriptor(Object object) { @@ -64,7 +64,7 @@ } public String getLabel(Object o) { - TableStub table = getTable(o); + Table table = getTable(o); //return Table.qualify(table.getCatalog(), table.getSchema(), table.getName(), '.'); return table.getName(); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TypeNameValueVisitor.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TypeNameValueVisitor.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TypeNameValueVisitor.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -27,13 +27,13 @@ import org.hibernate.mediator.x.mapping.Component; import org.hibernate.mediator.x.mapping.DependantValue; import org.hibernate.mediator.x.mapping.IdentifierBag; -import org.hibernate.mediator.x.mapping.ListStub; +import org.hibernate.mediator.x.mapping.List; import org.hibernate.mediator.x.mapping.ManyToOne; -import org.hibernate.mediator.x.mapping.MapStub; +import org.hibernate.mediator.x.mapping.Map; import org.hibernate.mediator.x.mapping.OneToMany; import org.hibernate.mediator.x.mapping.OneToOne; import org.hibernate.mediator.x.mapping.PrimitiveArray; -import org.hibernate.mediator.x.mapping.SetStub; +import org.hibernate.mediator.x.mapping.Set; import org.hibernate.mediator.x.mapping.SimpleValue; import org.hibernate.mediator.x.mapping.ValueVisitor; @@ -54,7 +54,7 @@ return "IdBag <" + bag.getElement().accept(this) + ">"; //$NON-NLS-1$//$NON-NLS-2$ } - public Object accept(ListStub list) { + public Object accept(List list) { return "List <" + list.getElement().accept(this) + ">"; //$NON-NLS-1$ //$NON-NLS-2$ } @@ -66,7 +66,7 @@ return list.getElement().accept(this) + "[]"; //$NON-NLS-1$ } - public Object accept(MapStub map) { + public Object accept(Map map) { return "Map<" + map.getElement().accept(this) + ">"; //$NON-NLS-1$ //$NON-NLS-2$ } @@ -81,7 +81,7 @@ return referencedEntityName; } - public Object accept(SetStub set) { + public Object accept(Set set) { return "Set<" + set.getElement().accept(this) + ">"; //$NON-NLS-1$ //$NON-NLS-2$ } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/RelationalGraphView.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/RelationalGraphView.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/RelationalGraphView.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -30,7 +30,7 @@ import org.hibernate.eclipse.graph.model.TableViewAdapter; import org.hibernate.eclipse.graph.parts.ConfigurationEditPart; import org.hibernate.eclipse.graph.parts.PersistentClassEditPart; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; public class RelationalGraphView extends AbstractGraphViewPart { @@ -60,7 +60,7 @@ cv = new ConfigurationViewAdapter(pe.getPersistentClassViewAdapter().getConfiguration().getConfiguration()); } - TableStub table = pe.getPersistentClassViewAdapter().getPersistentClass().getTable(); + Table table = pe.getPersistentClassViewAdapter().getPersistentClass().getTable(); tables.add(new TableViewAdapter(cv,table)); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PropertyViewAdapter.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PropertyViewAdapter.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/PropertyViewAdapter.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -30,7 +30,7 @@ import org.hibernate.eclipse.console.HibernateConsolePlugin; import org.hibernate.eclipse.console.workbench.HibernateWorkbenchHelper; import org.hibernate.mediator.HibernateConsoleRuntimeException; -import org.hibernate.mediator.x.mapping.CollectionStub; +import org.hibernate.mediator.x.mapping.Collection; import org.hibernate.mediator.x.mapping.OneToMany; import org.hibernate.mediator.x.mapping.Property; import org.hibernate.mediator.x.type.EntityType; @@ -78,8 +78,8 @@ private void createSingleEndedEnityAssociations() { try { //TODO: we need the consoleconfiguration here to know the exact types - if ( property.getValue() instanceof CollectionStub ) { - CollectionStub collection = (CollectionStub) property.getValue(); + if ( property.getValue() instanceof Collection ) { + Collection collection = (Collection) property.getValue(); if(!collection.isInverse() && collection.getElement() instanceof OneToMany) { OneToMany oneToMany = (OneToMany) collection.getElement(); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/TableViewAdapter.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/TableViewAdapter.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/graph/model/TableViewAdapter.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -26,15 +26,15 @@ import java.util.List; import org.hibernate.mediator.x.mapping.Column; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; public class TableViewAdapter extends GraphNode { - private TableStub table; + private Table table; private final ConfigurationViewAdapter configuration; - public TableViewAdapter(ConfigurationViewAdapter configuration, TableStub table) { + public TableViewAdapter(ConfigurationViewAdapter configuration, Table table) { this.configuration = configuration; this.table = table; } @@ -44,7 +44,7 @@ } - public TableStub getTable() { + public Table getTable() { return table; } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/nature/HibernateNature.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/nature/HibernateNature.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/nature/HibernateNature.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -52,7 +52,7 @@ import org.hibernate.mediator.x.cfg.ConfigurationFactory; import org.hibernate.mediator.x.cfg.JDBCMetaDataConfiguration; import org.hibernate.mediator.x.cfg.reveng.TableIdentifier; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.osgi.service.prefs.Preferences; public class HibernateNature implements IProjectNature { @@ -118,11 +118,11 @@ } } - List<TableStub> tables = null; + List<Table> tables = null; private ReadDatabaseMetaData job; - public List<TableStub> getTables() { + public List<Table> getTables() { ConsoleConfiguration ccfg = getDefaultConsoleConfiguration(); if(ccfg==null) return Collections.emptyList(); @@ -172,11 +172,11 @@ } - public List<TableStub> getMatchingTables(String tableName) { - List<TableStub> result = new ArrayList<TableStub>(); - Iterator<TableStub> tableMappings = getTables().iterator(); + public List<Table> getMatchingTables(String tableName) { + List<Table> result = new ArrayList<Table>(); + Iterator<Table> tableMappings = getTables().iterator(); while (tableMappings.hasNext() ) { - TableStub table = tableMappings.next(); + Table table = tableMappings.next(); if(table.getName().toUpperCase().startsWith(tableName.toUpperCase()) ) { result.add(table); } @@ -184,10 +184,10 @@ return result; } - public TableStub getTable(TableIdentifier nearestTableName) { + public Table getTable(TableIdentifier nearestTableName) { // TODO: can be made MUCH more efficient with proper indexing of the tables. // TODO: handle catalog/schema properly - for (TableStub table : getTables()) { + for (Table table : getTables()) { if(nearestTableName.getName().equals(table.getName())) { return table; } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/wizards/ConfigurationActor.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.hibernate.eclipse.jdt.ui.wizards; -import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -52,14 +51,12 @@ import org.hibernate.mediator.x.cfg.Mappings; import org.hibernate.mediator.x.mapping.Array; import org.hibernate.mediator.x.mapping.Bag; -import org.hibernate.mediator.x.mapping.CollectionStub; +import org.hibernate.mediator.x.mapping.Collection; import org.hibernate.mediator.x.mapping.Column; import org.hibernate.mediator.x.mapping.IndexedCollection; import org.hibernate.mediator.x.mapping.JoinedSubclass; import org.hibernate.mediator.x.mapping.KeyValue; -import org.hibernate.mediator.x.mapping.ListStub; import org.hibernate.mediator.x.mapping.ManyToOne; -import org.hibernate.mediator.x.mapping.MapStub; import org.hibernate.mediator.x.mapping.OneToMany; import org.hibernate.mediator.x.mapping.OneToOne; import org.hibernate.mediator.x.mapping.PersistentClass; @@ -67,10 +64,9 @@ import org.hibernate.mediator.x.mapping.PrimitiveArray; import org.hibernate.mediator.x.mapping.Property; import org.hibernate.mediator.x.mapping.RootClass; -import org.hibernate.mediator.x.mapping.SetStub; import org.hibernate.mediator.x.mapping.SimpleValue; import org.hibernate.mediator.x.mapping.Subclass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.hibernate.mediator.x.mapping.ToOne; import org.hibernate.mediator.x.mapping.Value; import org.hibernate.mediator.x.type.EnumType; @@ -156,7 +152,7 @@ ConfigurationFactory configStubFactory = new ConfigurationFactory(null); Configuration config = configStubFactory.createConfiguration(); Mappings mappings = config.createMappings(); - Collection<PersistentClass> classesCollection = createHierarhyStructure(project, processor.getRootClasses()); + java.util.Collection<PersistentClass> classesCollection = createHierarhyStructure(project, processor.getRootClasses()); for (PersistentClass persistentClass : classesCollection) { mappings.addClass(persistentClass); } @@ -170,7 +166,7 @@ * @return */ @SuppressWarnings("unchecked") - private Collection<PersistentClass> createHierarhyStructure(IJavaProject project, Map<String, RootClass> rootClasses){ + private java.util.Collection<PersistentClass> createHierarhyStructure(IJavaProject project, Map<String, RootClass> rootClasses){ Map<String, PersistentClass> pcCopy = new HashMap<String, PersistentClass>(); for (Map.Entry<String, RootClass> entry : rootClasses.entrySet()) { pcCopy.put(entry.getKey(), entry.getValue()); @@ -204,7 +200,7 @@ subclass.setDiscriminatorValue(StringHelper.unqualify(pastClass.getClassName())); subclass.setAbstract(pastClass.isAbstract()); if (subclass instanceof JoinedSubclass) { - ((JoinedSubclass) subclass).setTable(TableStub.newInstance(pastClass.getClassName().toUpperCase())); + ((JoinedSubclass) subclass).setTable(Table.newInstance(pastClass.getClassName().toUpperCase())); ((JoinedSubclass) subclass).setKey((KeyValue) pc.getIdentifierProperty().getValue()); } else { if (pastClass.getIdentifierProperty() != null) { @@ -279,7 +275,7 @@ Map.Entry<String, EntityInfo> entry = it.next(); EntityInfo entryInfo = entry.getValue(); String className = entryInfo.getName(); - TableStub table = TableStub.newInstance(className.toUpperCase()); + Table table = Table.newInstance(className.toUpperCase()); RootClass rootClass = RootClass.newInstance(); rootClass.setEntityName( entryInfo.getFullyQualifiedName() ); rootClass.setClassName( entryInfo.getFullyQualifiedName() ); @@ -508,7 +504,7 @@ ITypeBinding[] interfaces = Utils.getAllInterfaces(tb); Value value = buildCollectionValue(interfaces); if (value != null) { - CollectionStub cValue = (CollectionStub)value; + Collection cValue = (Collection)value; if (ref != null && rootClasses.get(ref.fullyQualifiedName) != null){ OneToMany oValue = OneToMany.newInstance(rootClass); RootClass associatedClass = rootClasses.get(ref.fullyQualifiedName); @@ -523,9 +519,9 @@ cValue.setElement(elementValue); cValue.setCollectionTable(rootClass.getTable());//TODO what to set? } - if (value instanceof ListStub){ + if (value instanceof List){ ((IndexedCollection)cValue).setIndex(SimpleValue.newInstance()); - } else if (value instanceof MapStub){ + } else if (value instanceof Map){ SimpleValue map_key = SimpleValue.newInstance(); //FIXME: is it possible to map Map<SourceType, String>? //Or only Map<String, SourceType> @@ -564,12 +560,12 @@ Value value = buildCollectionValue(interfaces); if (value != null){ SimpleValue element = buildSimpleValue("string");//$NON-NLS-1$ - ((CollectionStub) value).setElement(element); - ((CollectionStub) value).setCollectionTable(rootClass.getTable());//TODO what to set? + ((Collection) value).setElement(element); + ((Collection) value).setCollectionTable(rootClass.getTable());//TODO what to set? buildProperty(value); - if (value instanceof ListStub){ + if (value instanceof List){ ((IndexedCollection)value).setIndex(SimpleValue.newInstance()); - } else if (value instanceof MapStub){ + } else if (value instanceof Map){ SimpleValue map_key = SimpleValue.newInstance(); //FIXME: how to detect key-type here map_key.setTypeName("string"); //$NON-NLS-1$ @@ -637,14 +633,14 @@ return sValue; } - private CollectionStub buildCollectionValue(ITypeBinding[] interfaces){ - CollectionStub cValue = null; + private Collection buildCollectionValue(ITypeBinding[] interfaces){ + Collection cValue = null; if (Utils.isImplementInterface(interfaces, Set.class.getName())){ - cValue = SetStub.newInstance(rootClass); + cValue = org.hibernate.mediator.x.mapping.Set.newInstance(rootClass); } else if (Utils.isImplementInterface(interfaces, List.class.getName())){ - cValue = ListStub.newInstance(rootClass); + cValue = org.hibernate.mediator.x.mapping.List.newInstance(rootClass); } else if (Utils.isImplementInterface(interfaces, Map.class.getName())){ - cValue = MapStub.newInstance(rootClass); + cValue = org.hibernate.mediator.x.mapping.Map.newInstance(rootClass); } else if (Utils.isImplementInterface(interfaces, Collection.class.getName())){ cValue = Bag.newInstance(rootClass); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/editors/reveng/TablePropertiesBlock.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -72,7 +72,7 @@ import org.hibernate.mediator.x.cfg.reveng.TableIdentifier; import org.hibernate.mediator.x.mapping.Column; import org.hibernate.mediator.x.mapping.PrimaryKey; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; public class TablePropertiesBlock extends MasterDetailsBlock { @@ -163,7 +163,7 @@ LazyDatabaseSchema lds = editor.getLazyDatabaseSchema(); - Map<TableIdentifier, TableStub> tables = new HashMap<TableIdentifier, TableStub>(); + Map<TableIdentifier, Table> tables = new HashMap<TableIdentifier, Table>(); Map<TableIdentifier, List<Column> > columns = new HashMap<TableIdentifier, List<Column> >(); if (lds == null) { @@ -197,8 +197,8 @@ if(result!=null) { for (int i = 0; i < result.length; i++) { Object object = result[i]; - if(object instanceof TableStub) { - TableStub table = (TableStub) object; + if(object instanceof Table) { + Table table = (Table) object; tables.put(TableIdentifier.create(table), table); lastTable = TableIdentifier.create(table); } else if (object instanceof Column) { @@ -220,10 +220,10 @@ } } - Iterator<Map.Entry<TableIdentifier, TableStub>> iterator = tables.entrySet().iterator(); + Iterator<Map.Entry<TableIdentifier, Table>> iterator = tables.entrySet().iterator(); while ( iterator.hasNext() ) { - Map.Entry<TableIdentifier, TableStub> element = iterator.next(); - TableStub table = element.getValue(); + Map.Entry<TableIdentifier, Table> element = iterator.next(); + Table table = element.getValue(); IRevEngTable retable = null; // editor.getReverseEngineeringDefinition().findTable(TableIdentifier.create(table)); if(retable==null) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/ColumnNameHandler.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/ColumnNameHandler.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/ColumnNameHandler.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -32,7 +32,7 @@ import org.hibernate.eclipse.nature.HibernateNature; import org.hibernate.mediator.x.cfg.reveng.TableIdentifier; import org.hibernate.mediator.x.mapping.Column; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.w3c.dom.Attr; import org.w3c.dom.Node; @@ -54,7 +54,7 @@ if(nature!=null) { TableIdentifier nearestTableName = extractor.getNearestTableName(node); if(nearestTableName!=null) { - TableStub table = nature.getTable(nearestTableName); + Table table = nature.getTable(nearestTableName); if (table!=null) { Iterator tableMappings = table.getColumnIterator(); while (tableMappings.hasNext() ) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/TableNameHandler.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/TableNameHandler.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.eclipse.mapper/src/org/hibernate/eclipse/mapper/extractor/TableNameHandler.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -30,7 +30,7 @@ import org.eclipse.jface.text.contentassist.CompletionProposal; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.hibernate.eclipse.nature.HibernateNature; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.w3c.dom.Attr; import org.w3c.dom.Node; @@ -41,7 +41,7 @@ IJavaProject javaProject, Node node, String attributeName, String start, int offset) { - List<TableStub> tables = new ArrayList<TableStub>(); + List<Table> tables = new ArrayList<Table>(); HibernateNature nature = HibernateNature.getHibernateNature( javaProject ); if(nature!=null) { @@ -49,8 +49,8 @@ } List<ICompletionProposal> proposals = new ArrayList<ICompletionProposal>(); - for (Iterator<TableStub> iter = tables.iterator(); iter.hasNext();) { - TableStub element = iter.next(); + for (Iterator<Table> iter = tables.iterator(); iter.hasNext();) { + Table element = iter.next(); proposals.add(new CompletionProposal(element.getName(), offset, start.length(), element.getName().length(), null, null, null, null) ); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/ConsoleQueryParameter.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/ConsoleQueryParameter.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/ConsoleQueryParameter.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -33,7 +33,7 @@ import java.util.TimeZone; import org.hibernate.mediator.x.Hibernate; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.hibernate.mediator.x.type.NullableType; import org.hibernate.mediator.x.type.Type; @@ -54,7 +54,7 @@ addTypeFormat(Hibernate.INTEGER, Integer.valueOf(42)); addTypeFormat(Hibernate.BIG_DECIMAL, new BigDecimal(42.0)); addTypeFormat(Hibernate.CHARACTER, Character.valueOf('h')); - addTypeFormat(Hibernate.CLASS, TableStub.class); + addTypeFormat(Hibernate.CLASS, Table.class); addTypeFormat(Hibernate.CURRENCY, Currency.getInstance(Locale.getDefault())); addTypeFormat(Hibernate.DATE, new Date()); addTypeFormat(Hibernate.DOUBLE, Double.valueOf(42.42)); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/JDBCMetaDataConfiguration.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/JDBCMetaDataConfiguration.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/JDBCMetaDataConfiguration.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -5,7 +5,7 @@ import java.util.Properties; import org.hibernate.mediator.base.HObject; import org.hibernate.mediator.x.cfg.reveng.ReverseEngineeringStrategy; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; public class JDBCMetaDataConfiguration extends Configuration { public static final String CL = "org.hibernate.cfg.JDBCMetaDataConfiguration"; //$NON-NLS-1$ @@ -36,19 +36,19 @@ } @SuppressWarnings("unchecked") - public ArrayList<TableStub> getTableMappingsArr() { - ArrayList<TableStub> arr = new ArrayList<TableStub>(); + public ArrayList<Table> getTableMappingsArr() { + ArrayList<Table> arr = new ArrayList<Table>(); Iterator it = (Iterator)invoke(mn()); while (it.hasNext() ) { Object obj = it.next(); if (obj != null) { - arr.add(new TableStub(obj)); + arr.add(new Table(obj)); } } return arr; } - public Iterator<TableStub> getTableMappingsIt() { + public Iterator<Table> getTableMappingsIt() { return getTableMappingsArr().iterator(); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/reveng/DefaultDatabaseCollector.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/reveng/DefaultDatabaseCollector.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/reveng/DefaultDatabaseCollector.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Map.Entry; import org.hibernate.mediator.base.HObject; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; public class DefaultDatabaseCollector extends HObject { public static final String CL = "org.hibernate.cfg.reveng.DefaultDatabaseCollector"; //$NON-NLS-1$ @@ -21,17 +21,17 @@ } @SuppressWarnings("unchecked") - public Iterator<Entry<String, List<TableStub>>> getQualifierEntries() { + public Iterator<Entry<String, List<Table>>> getQualifierEntries() { Iterator<Map.Entry<String, List>> it = (Iterator<Map.Entry<String, List>>)invoke(mn()); - HashMap<String, List<TableStub>> map = new HashMap<String, List<TableStub>>(); + HashMap<String, List<Table>> map = new HashMap<String, List<Table>>(); while (it.hasNext()) { Map.Entry<String, List> entry = it.next(); - ArrayList<TableStub> arr = new ArrayList<TableStub>(); + ArrayList<Table> arr = new ArrayList<Table>(); Iterator itValue = (Iterator)entry.getValue().iterator(); while (itValue.hasNext()) { Object obj = itValue.next(); if (obj != null) { - arr.add(new TableStub(obj)); + arr.add(new Table(obj)); } } map.put(entry.getKey(), arr); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/reveng/TableIdentifier.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/reveng/TableIdentifier.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/cfg/reveng/TableIdentifier.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -1,7 +1,7 @@ package org.hibernate.mediator.x.cfg.reveng; import org.hibernate.mediator.base.HObject; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; public class TableIdentifier extends HObject { public static final String CL = "org.hibernate.cfg.reveng.TableIdentifier"; //$NON-NLS-1$ @@ -10,7 +10,7 @@ super(tableIdentifier, CL); } - public static TableIdentifier create(TableStub table) { + public static TableIdentifier create(Table table) { return newInstance(table.getCatalog(), table.getSchema(), table.getName() ); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Array.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Array.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Array.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -2,7 +2,7 @@ import org.hibernate.mediator.base.HObject; -public class Array extends ListStub { +public class Array extends List { public static final String CL = "org.hibernate.mapping.Array"; //$NON-NLS-1$ protected Array(Object array) { @@ -21,7 +21,7 @@ invoke(mn(), element); } - public void setCollectionTable(TableStub table) { + public void setCollectionTable(Table table) { invoke(mn(), table); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Bag.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Bag.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Bag.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -1,7 +1,7 @@ package org.hibernate.mediator.x.mapping; -public class Bag extends CollectionStub { +public class Bag extends Collection { public static final String CL = "org.hibernate.mapping.Bag"; //$NON-NLS-1$ protected Bag(Object bag) { Copied: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Collection.java (from rev 21404, branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/CollectionStub.java) =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Collection.java (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Collection.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -0,0 +1,63 @@ +package org.hibernate.mediator.x.mapping; + +import org.hibernate.mediator.x.FetchMode; + +public abstract class Collection extends Value { + public static final String CL = "org.hibernate.mapping.Collection"; //$NON-NLS-1$ + + protected Collection(Object collection) { + super(collection, CL); + } + + protected Collection(Object collection, String cn) { + super(collection, cn); + } + + public void setCollectionTable(Table table) { + invoke(mn(), table); + } + + public void setKey(KeyValue key) { + invoke(mn(), key); + } + + public void setLazy(boolean lazy) { + invoke(mn(), lazy); + } + + public void setRole(String role) { + invoke(mn(), role); + } + + public void setElement(Value element) { + invoke(mn(), element); + } + + public void setFetchMode(FetchMode fetchMode) { + invoke(mn(), fetchMode); + } + + public Value getElement() { + return ValueFactory.createValueStub(invoke(mn())); + } + + public Table getCollectionTable() { + Object obj = invoke(mn()); + if (obj == null) { + return null; + } + return new Table(obj); + } + + public KeyValue getKey() { + return (KeyValue)ValueFactory.createValueStub(invoke(mn())); + } + + public boolean isOneToMany() { + return (Boolean)invoke(mn()); + } + + public boolean isInverse() { + return (Boolean)invoke(mn()); + } +} Deleted: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/CollectionStub.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/CollectionStub.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/CollectionStub.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -1,63 +0,0 @@ -package org.hibernate.mediator.x.mapping; - -import org.hibernate.mediator.x.FetchMode; - -public abstract class CollectionStub extends Value { - public static final String CL = "org.hibernate.mapping.Collection"; //$NON-NLS-1$ - - protected CollectionStub(Object collection) { - super(collection, CL); - } - - protected CollectionStub(Object collection, String cn) { - super(collection, cn); - } - - public void setCollectionTable(TableStub table) { - invoke(mn(), table); - } - - public void setKey(KeyValue key) { - invoke(mn(), key); - } - - public void setLazy(boolean lazy) { - invoke(mn(), lazy); - } - - public void setRole(String role) { - invoke(mn(), role); - } - - public void setElement(Value element) { - invoke(mn(), element); - } - - public void setFetchMode(FetchMode fetchMode) { - invoke(mn(), fetchMode); - } - - public Value getElement() { - return ValueFactory.createValueStub(invoke(mn())); - } - - public TableStub getCollectionTable() { - Object obj = invoke(mn()); - if (obj == null) { - return null; - } - return new TableStub(obj); - } - - public KeyValue getKey() { - return (KeyValue)ValueFactory.createValueStub(invoke(mn())); - } - - public boolean isOneToMany() { - return (Boolean)invoke(mn()); - } - - public boolean isInverse() { - return (Boolean)invoke(mn()); - } -} Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ForeignKey.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ForeignKey.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ForeignKey.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -17,12 +17,12 @@ return (Boolean)invoke(mn(), column); } - public TableStub getReferencedTable() { + public Table getReferencedTable() { Object obj = invoke(mn()); if (obj == null) { return null; } - return new TableStub(obj); + return new Table(obj); } @SuppressWarnings("unchecked") Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/IdentifierCollection.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/IdentifierCollection.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/IdentifierCollection.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -1,7 +1,7 @@ package org.hibernate.mediator.x.mapping; -public abstract class IdentifierCollection extends CollectionStub { +public abstract class IdentifierCollection extends Collection { public static final String CL = "org.hibernate.mapping.IdentifierCollection"; //$NON-NLS-1$ protected IdentifierCollection(Object identifierCollection) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/IndexedCollection.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/IndexedCollection.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/IndexedCollection.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -1,7 +1,7 @@ package org.hibernate.mediator.x.mapping; -public abstract class IndexedCollection extends CollectionStub { +public abstract class IndexedCollection extends Collection { public static final String CL = "org.hibernate.mapping.IndexedCollection"; //$NON-NLS-1$ protected IndexedCollection(Object indexedCollection) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/JoinedSubclass.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/JoinedSubclass.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/JoinedSubclass.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -12,7 +12,7 @@ return new JoinedSubclass(newInstance(CL, persistentClass)); } - public void setTable(TableStub table) { + public void setTable(Table table) { invoke(mn(), table); } Copied: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/List.java (from rev 21404, branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ListStub.java) =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/List.java (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/List.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -0,0 +1,28 @@ +package org.hibernate.mediator.x.mapping; + + +public class List extends IndexedCollection { + public static final String CL = "org.hibernate.mapping.List"; //$NON-NLS-1$ + + protected List(Object list) { + super(list, CL); + } + + protected List(Object list, String cn) { + super(list, cn); + } + + public static List newInstance(PersistentClass owner) { + return new List(newInstance(CL, owner)); + } + + @Override + public Object accept(ValueVisitor visitor) { + return visitor.accept(this); + } + + public Value getIndex() { + return ValueFactory.createValueStub(invoke(mn())); + } + +} Deleted: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ListStub.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ListStub.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ListStub.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -1,28 +0,0 @@ -package org.hibernate.mediator.x.mapping; - - -public class ListStub extends IndexedCollection { - public static final String CL = "org.hibernate.mapping.List"; //$NON-NLS-1$ - - protected ListStub(Object list) { - super(list, CL); - } - - protected ListStub(Object list, String cn) { - super(list, cn); - } - - public static ListStub newInstance(PersistentClass owner) { - return new ListStub(newInstance(CL, owner)); - } - - @Override - public Object accept(ValueVisitor visitor) { - return visitor.accept(this); - } - - public Value getIndex() { - return ValueFactory.createValueStub(invoke(mn())); - } - -} Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ManyToOne.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ManyToOne.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ManyToOne.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -8,7 +8,7 @@ super(manyToOne, CL); } - public static ManyToOne newInstance(TableStub table) { + public static ManyToOne newInstance(Table table) { return new ManyToOne(newInstance(CL, table)); } Copied: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Map.java (from rev 21404, branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/MapStub.java) =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Map.java (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Map.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -0,0 +1,19 @@ +package org.hibernate.mediator.x.mapping; + + +public class Map extends IndexedCollection { + public static final String CL = "org.hibernate.mapping.Map"; //$NON-NLS-1$ + + protected Map(Object map) { + super(map, CL); + } + + public static Map newInstance(PersistentClass owner) { + return new Map(newInstance(CL, owner)); + } + + @Override + public Object accept(ValueVisitor visitor) { + return visitor.accept(this); + } +} Deleted: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/MapStub.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/MapStub.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/MapStub.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -1,19 +0,0 @@ -package org.hibernate.mediator.x.mapping; - - -public class MapStub extends IndexedCollection { - public static final String CL = "org.hibernate.mapping.Map"; //$NON-NLS-1$ - - protected MapStub(Object map) { - super(map, CL); - } - - public static MapStub newInstance(PersistentClass owner) { - return new MapStub(newInstance(CL, owner)); - } - - @Override - public Object accept(ValueVisitor visitor) { - return visitor.accept(this); - } -} Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/OneToOne.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/OneToOne.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/OneToOne.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -8,7 +8,7 @@ super(oneToOne, CL); } - public static OneToOne newInstance(TableStub table, PersistentClass owner) { + public static OneToOne newInstance(Table table, PersistentClass owner) { return new OneToOne(newInstance(CL, table, owner)); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/PersistentClass.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/PersistentClass.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/PersistentClass.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -69,12 +69,12 @@ return new Property(obj); } - public TableStub getTable() { + public Table getTable() { Object obj = invoke(mn()); if (obj == null) { return null; } - return new TableStub(obj); + return new Table(obj); } @SuppressWarnings("unchecked") Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/PrimaryKey.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/PrimaryKey.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/PrimaryKey.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -59,12 +59,12 @@ return new Column(obj); } - public TableStub getTable() { + public Table getTable() { Object obj = invoke(mn()); if (obj == null) { return null; } - return new TableStub(obj); + return new Table(obj); } } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/RootClass.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/RootClass.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/RootClass.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -23,12 +23,12 @@ invoke(mn(), discr); } - public TableStub getTable() { + public Table getTable() { Object obj = invoke(mn()); if (obj == null) { return null; } - return new TableStub(obj); + return new Table(obj); } public void addProperty(Property p) { @@ -63,7 +63,7 @@ invoke(mn(), lazy); } - public void setTable(TableStub table) { + public void setTable(Table table) { invoke(mn(), table); } Copied: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Set.java (from rev 21404, branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/SetStub.java) =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Set.java (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Set.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -0,0 +1,20 @@ +package org.hibernate.mediator.x.mapping; + + +public class Set extends Collection { + public static final String CL = "org.hibernate.mapping.Set"; //$NON-NLS-1$ + + protected Set(Object set) { + super(set, CL); + } + + public static Set newInstance(PersistentClass owner) { + return new Set(newInstance(CL, owner)); + } + + @Override + public Object accept(ValueVisitor visitor) { + return visitor.accept(this); + } + +} Deleted: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/SetStub.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/SetStub.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/SetStub.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -1,20 +0,0 @@ -package org.hibernate.mediator.x.mapping; - - -public class SetStub extends CollectionStub { - public static final String CL = "org.hibernate.mapping.Set"; //$NON-NLS-1$ - - protected SetStub(Object set) { - super(set, CL); - } - - public static SetStub newInstance(PersistentClass owner) { - return new SetStub(newInstance(CL, owner)); - } - - @Override - public Object accept(ValueVisitor visitor) { - return visitor.accept(this); - } - -} Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/SimpleValue.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/SimpleValue.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/SimpleValue.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -26,7 +26,7 @@ invoke(mn(), column); } - public void setTable(TableStub table) { + public void setTable(Table table) { invoke(mn(), table); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Subclass.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Subclass.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Subclass.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -32,12 +32,12 @@ invoke(mn(), p); } - public TableStub getRootTable() { + public Table getRootTable() { Object obj = invoke(mn()); if (obj == null) { return null; } - return new TableStub(obj); + return new Table(obj); } public boolean isJoinedSubclass() { Copied: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Table.java (from rev 21404, branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/TableStub.java) =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Table.java (rev 0) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Table.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -0,0 +1,106 @@ +package org.hibernate.mediator.x.mapping; + +import java.util.ArrayList; +import java.util.Iterator; + +import org.hibernate.mediator.HibernateConsoleRuntimeException; +import org.hibernate.mediator.Messages; +import org.hibernate.mediator.base.HObject; + +public class Table extends HObject { + public static final String CL = "org.hibernate.mapping.Table"; //$NON-NLS-1$ + + public Table(Object table) { + super(table, CL); + } + + public static Table newInstance(String name) { + return new Table(newInstance(CL, name)); + } + + public String getName() { + return (String)invoke(mn()); + } + + public PrimaryKey getPrimaryKey() { + Object obj = invoke(mn()); + if (obj == null) { + return null; + } + return new PrimaryKey(obj); + } + + @SuppressWarnings("unchecked") + public Iterator<ForeignKey> getForeignKeyIterator() { + Iterator it = (Iterator)invoke(mn()); + ArrayList<ForeignKey> al = new ArrayList<ForeignKey>(); + while (it.hasNext()) { + Object obj = it.next(); + if (obj != null) { + al.add(new ForeignKey(obj)); + } + } + return al.iterator(); + } + + public String getCatalog() { + return (String)invoke(mn()); + } + + public String getSchema() { + return (String)invoke(mn()); + } + + public KeyValue getIdentifierValue() { + Object obj = invoke(mn()); + if (obj == null) { + return null; + } + Value res = ValueFactory.createValueStub(obj); + if (res instanceof KeyValue) { + return (KeyValue)res; + } + throw new HibernateConsoleRuntimeException(Messages.Stub_create_null_stub_prohibit); + } + + @SuppressWarnings("unchecked") + public Iterator<Column> getColumnIterator() { + Iterator it = (Iterator)invoke(mn()); + ArrayList<Column> al = new ArrayList<Column>(); + while (it.hasNext()) { + Object obj = it.next(); + if (obj != null) { + al.add(new Column(obj)); + } + } + return al.iterator(); + } + + public String getComment() { + return (String)invoke(mn()); + } + + public String getRowId() { + return (String)invoke(mn()); + } + + public String getSubselect() { + return (String)invoke(mn()); + } + + public boolean hasDenormalizedTables() { + return (Boolean)invoke(mn()); + } + + public boolean isAbstract() { + return (Boolean)invoke(mn()); + } + + public boolean isAbstractUnionTable() { + return (Boolean)invoke(mn()); + } + + public boolean isPhysicalTable() { + return (Boolean)invoke(mn()); + } +} Deleted: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/TableStub.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/TableStub.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/TableStub.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -1,106 +0,0 @@ -package org.hibernate.mediator.x.mapping; - -import java.util.ArrayList; -import java.util.Iterator; - -import org.hibernate.mediator.HibernateConsoleRuntimeException; -import org.hibernate.mediator.Messages; -import org.hibernate.mediator.base.HObject; - -public class TableStub extends HObject { - public static final String CL = "org.hibernate.mapping.Table"; //$NON-NLS-1$ - - public TableStub(Object table) { - super(table, CL); - } - - public static TableStub newInstance(String name) { - return new TableStub(newInstance(CL, name)); - } - - public String getName() { - return (String)invoke(mn()); - } - - public PrimaryKey getPrimaryKey() { - Object obj = invoke(mn()); - if (obj == null) { - return null; - } - return new PrimaryKey(obj); - } - - @SuppressWarnings("unchecked") - public Iterator<ForeignKey> getForeignKeyIterator() { - Iterator it = (Iterator)invoke(mn()); - ArrayList<ForeignKey> al = new ArrayList<ForeignKey>(); - while (it.hasNext()) { - Object obj = it.next(); - if (obj != null) { - al.add(new ForeignKey(obj)); - } - } - return al.iterator(); - } - - public String getCatalog() { - return (String)invoke(mn()); - } - - public String getSchema() { - return (String)invoke(mn()); - } - - public KeyValue getIdentifierValue() { - Object obj = invoke(mn()); - if (obj == null) { - return null; - } - Value res = ValueFactory.createValueStub(obj); - if (res instanceof KeyValue) { - return (KeyValue)res; - } - throw new HibernateConsoleRuntimeException(Messages.Stub_create_null_stub_prohibit); - } - - @SuppressWarnings("unchecked") - public Iterator<Column> getColumnIterator() { - Iterator it = (Iterator)invoke(mn()); - ArrayList<Column> al = new ArrayList<Column>(); - while (it.hasNext()) { - Object obj = it.next(); - if (obj != null) { - al.add(new Column(obj)); - } - } - return al.iterator(); - } - - public String getComment() { - return (String)invoke(mn()); - } - - public String getRowId() { - return (String)invoke(mn()); - } - - public String getSubselect() { - return (String)invoke(mn()); - } - - public boolean hasDenormalizedTables() { - return (Boolean)invoke(mn()); - } - - public boolean isAbstract() { - return (Boolean)invoke(mn()); - } - - public boolean isAbstractUnionTable() { - return (Boolean)invoke(mn()); - } - - public boolean isPhysicalTable() { - return (Boolean)invoke(mn()); - } -} Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Value.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Value.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/Value.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -18,12 +18,12 @@ super(value, cn); } - public TableStub getTable() { + public Table getTable() { Object obj = invoke(mn()); if (obj == null) { return null; } - return new TableStub(obj); + return new Table(obj); } public boolean isSimpleValue() { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ValueFactory.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ValueFactory.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ValueFactory.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -16,16 +16,16 @@ return new IdentifierBag(value); //} else if (0 == "org.hibernate.mapping.IndexedCollection".compareTo(cl.getName())) { // return new IndexedCollectionStub(value); - } else if (0 == ListStub.CL.compareTo(cl.getName())) { - return new ListStub(value); + } else if (0 == List.CL.compareTo(cl.getName())) { + return new List(value); } else if (0 == Array.CL.compareTo(cl.getName())) { return new Array(value); } else if (0 == PrimitiveArray.CL.compareTo(cl.getName())) { return new PrimitiveArray(value); - } else if (0 == MapStub.CL.compareTo(cl.getName())) { - return new MapStub(value); - } else if (0 == SetStub.CL.compareTo(cl.getName())) { - return new SetStub(value); + } else if (0 == Map.CL.compareTo(cl.getName())) { + return new Map(value); + } else if (0 == Set.CL.compareTo(cl.getName())) { + return new Set(value); } else if (0 == OneToMany.CL.compareTo(cl.getName())) { return new OneToMany(value); //} else if (0 == KeyValueStub.CL.compareTo(cl.getName())) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ValueVisitor.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ValueVisitor.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.hibernate.mediator/src/org/hibernate/mediator/x/mapping/ValueVisitor.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -5,12 +5,12 @@ public interface ValueVisitor { Object accept(Bag bag); Object accept(IdentifierBag bag); - Object accept(ListStub list); + Object accept(List list); Object accept(PrimitiveArray primitiveArray); Object accept(Array list); - Object accept(MapStub map); + Object accept(Map map); Object accept(OneToMany many); - Object accept(SetStub set); + Object accept(Set set); Object accept(Any any); Object accept(SimpleValue value); Object accept(DependantValue value); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateTableComposite.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateTableComposite.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.jpt.ui/src/org/jboss/tools/hibernate/jpt/ui/internal/mapping/details/HibernateTableComposite.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -51,7 +51,7 @@ * | ------------------------------------------------------------------------- | * -----------------------------------------------------------------------------</pre> * - * @see TableStub + * @see Table * @see EntityComposite - The parent container * @see TableCombo * @see CatalogCombo Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/OpenSourceAction.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -24,7 +24,7 @@ import org.hibernate.mediator.x.mapping.Column; import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.Property; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.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; @@ -61,7 +61,7 @@ while (iterator.hasNext() && editorPart == null) { Shape shape = iterator.next(); Object selection = shape.getOrmElement(); - if (selection instanceof Column || selection instanceof TableStub) { + if (selection instanceof Column || selection instanceof Table) { Iterator<Connection> targetConnections = shape.getTargetConnections().iterator(); while (targetConnections.hasNext()) { Connection connection = targetConnections.next(); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ShapeHideAction.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ShapeHideAction.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ShapeHideAction.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -21,7 +21,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IWorkbenchPart; import org.hibernate.mediator.x.mapping.PersistentClass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; import org.jboss.tools.hibernate.ui.diagram.editors.command.ToggleShapeVisibleStateCommand; @@ -109,7 +109,7 @@ if (null != obj && obj instanceof OrmShape) { OrmShape ormShape = (OrmShape)obj; Object ormElement = ormShape.getOrmElement(); - if (ormElement instanceof PersistentClass || ormElement instanceof TableStub) { + if (ormElement instanceof PersistentClass || ormElement instanceof Table) { if (ormShape.isVisible()) { res = true; } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ShapeShowAction.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ShapeShowAction.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ShapeShowAction.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -21,7 +21,7 @@ import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IWorkbenchPart; import org.hibernate.mediator.x.mapping.PersistentClass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; import org.jboss.tools.hibernate.ui.diagram.editors.command.ToggleShapeVisibleStateCommand; @@ -109,7 +109,7 @@ if (null != obj && obj instanceof OrmShape) { OrmShape ormShape = (OrmShape)obj; Object ormElement = ormShape.getOrmElement(); - if (ormElement instanceof PersistentClass || ormElement instanceof TableStub) { + if (ormElement instanceof PersistentClass || ormElement instanceof Table) { if (!ormShape.isVisible()) { res = true; } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAction.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAction.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/actions/ToggleShapeVisibleStateAction.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -22,7 +22,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IWorkbenchPart; import org.hibernate.mediator.x.mapping.PersistentClass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.DiagramViewerMessages; import org.jboss.tools.hibernate.ui.diagram.editors.DiagramViewer; import org.jboss.tools.hibernate.ui.diagram.editors.command.ToggleShapeVisibleStateCommand; @@ -120,7 +120,7 @@ } if (null != obj && obj instanceof OrmShape) { Object ormElement = ((OrmShape)obj).getOrmElement(); - if (ormElement instanceof PersistentClass || ormElement instanceof TableStub) { + if (ormElement instanceof PersistentClass || ormElement instanceof Table) { res = true; } } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/ToggleShapeVisibleStateCommand.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/ToggleShapeVisibleStateCommand.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/command/ToggleShapeVisibleStateCommand.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -15,7 +15,7 @@ import org.eclipse.gef.commands.Command; import org.hibernate.mediator.x.mapping.PersistentClass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.editors.model.OrmShape; /** @@ -46,7 +46,7 @@ } for (OrmShape shape : selectedShape) { Object ormElement = shape.getOrmElement(); - if (ormElement instanceof PersistentClass || ormElement instanceof TableStub) { + if (ormElement instanceof PersistentClass || ormElement instanceof Table) { shape.setVisible(!visState); } } @@ -56,7 +56,7 @@ for (int i = 0; i < selectedShape.size(); i++) { OrmShape shape = selectedShape.get(i); Object ormElement = shape.getOrmElement(); - if (ormElement instanceof PersistentClass || ormElement instanceof TableStub) { + if (ormElement instanceof PersistentClass || ormElement instanceof Table) { shape.setVisible(selectedShapeStates.get(i)); } } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ComponentShape.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ComponentShape.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ComponentShape.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -12,7 +12,7 @@ import java.util.Properties; -import org.hibernate.mediator.x.mapping.CollectionStub; +import org.hibernate.mediator.x.mapping.Collection; import org.hibernate.mediator.x.mapping.Property; /** @@ -31,7 +31,7 @@ protected void initModel() { Object ormElement = getOrmElement(); if (ormElement instanceof Property) { - CollectionStub collection = (CollectionStub)((Property)ormElement).getValue(); + Collection collection = (Collection)((Property)ormElement).getValue(); Shape bodyOrmShape = new Shape(collection.getKey()); bodyOrmShape.setIndent(20); addChild(bodyOrmShape); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Connection.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Connection.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Connection.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -18,7 +18,7 @@ import org.hibernate.mediator.x.mapping.OneToOne; import org.hibernate.mediator.x.mapping.Property; import org.hibernate.mediator.x.mapping.RootClass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; /** * Directed connection between 2 shapes, from source to target. @@ -131,23 +131,23 @@ */ public ConnectionType getConnectionType() { if (source instanceof OrmShape && target instanceof OrmShape) { - if ((source.getOrmElement() instanceof TableStub) && (target.getOrmElement() instanceof TableStub)) { + if ((source.getOrmElement() instanceof Table) && (target.getOrmElement() instanceof Table)) { return ConnectionType.ForeignKeyConstraint; } boolean bClassMapping = true; - if (!(source.getOrmElement() instanceof RootClass || source.getOrmElement() instanceof TableStub)) { + if (!(source.getOrmElement() instanceof RootClass || source.getOrmElement() instanceof Table)) { bClassMapping = false; } - if (!(target.getOrmElement() instanceof RootClass || target.getOrmElement() instanceof TableStub)) { + if (!(target.getOrmElement() instanceof RootClass || target.getOrmElement() instanceof Table)) { bClassMapping = false; } if (bClassMapping) { return ConnectionType.ClassMapping; } } - if ((source.getOrmElement() instanceof TableStub && target.getOrmElement() instanceof TableStub) || - (source.getOrmElement() instanceof TableStub && target.getOrmElement() instanceof Column) || - (source.getOrmElement() instanceof Column && target.getOrmElement() instanceof TableStub) || + if ((source.getOrmElement() instanceof Table && target.getOrmElement() instanceof Table) || + (source.getOrmElement() instanceof Table && target.getOrmElement() instanceof Column) || + (source.getOrmElement() instanceof Column && target.getOrmElement() instanceof Table) || (source.getOrmElement() instanceof Column && target.getOrmElement() instanceof Column)) { return ConnectionType.ForeignKeyConstraint; } @@ -260,16 +260,16 @@ } } else if (PROPERTY_TABLE_NAME.equals(propertyId)) { if (connectType == ConnectionType.ClassMapping) { - if (source.getOrmElement() instanceof TableStub) { - res = ((TableStub)(source.getOrmElement())).getName(); - } else if (target.getOrmElement() instanceof TableStub) { - res = ((TableStub)(target.getOrmElement())).getName(); + if (source.getOrmElement() instanceof Table) { + res = ((Table)(source.getOrmElement())).getName(); + } else if (target.getOrmElement() instanceof Table) { + res = ((Table)(target.getOrmElement())).getName(); } } else if (connectType == ConnectionType.PropertyMapping) { - if (((Shape)source.getParent()).getOrmElement() instanceof TableStub) { - res = ((TableStub)(((Shape)source.getParent()).getOrmElement())).getName(); - } else if (((Shape)target.getParent()).getOrmElement() instanceof TableStub) { - res = ((TableStub)(((Shape)target.getParent()).getOrmElement())).getName(); + if (((Shape)source.getParent()).getOrmElement() instanceof Table) { + res = ((Table)(((Shape)source.getParent()).getOrmElement())).getName(); + } else if (((Shape)target.getParent()).getOrmElement() instanceof Table) { + res = ((Table)(((Shape)target.getParent()).getOrmElement())).getName(); } } } else if (PROPERTY_CLASS_FIELD.equals(propertyId)) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/ElementsFactory.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -17,7 +17,7 @@ import java.util.Set; import org.hibernate.mediator.x.cfg.Configuration; -import org.hibernate.mediator.x.mapping.CollectionStub; +import org.hibernate.mediator.x.mapping.Collection; import org.hibernate.mediator.x.mapping.Column; import org.hibernate.mediator.x.mapping.Component; import org.hibernate.mediator.x.mapping.DependantValue; @@ -29,7 +29,7 @@ import org.hibernate.mediator.x.mapping.RootClass; import org.hibernate.mediator.x.mapping.SimpleValue; import org.hibernate.mediator.x.mapping.Subclass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.hibernate.mediator.x.mapping.Value; import org.hibernate.mediator.x.type.EntityType; import org.hibernate.mediator.x.type.Type; @@ -61,12 +61,12 @@ while (it.hasNext()) { final OrmShape shape = it.next(); Object ormElement = shape.getOrmElement(); - if (ormElement instanceof TableStub) { - TableStub databaseTable = (TableStub)ormElement; + if (ormElement instanceof Table) { + Table databaseTable = (Table)ormElement; Iterator<ForeignKey> itFK = (Iterator<ForeignKey>)databaseTable.getForeignKeyIterator(); while (itFK.hasNext()) { final ForeignKey fk = itFK.next(); - TableStub referencedTable = fk.getReferencedTable(); + Table referencedTable = fk.getReferencedTable(); final OrmShape referencedShape = getOrCreateDatabaseTable(referencedTable); // Iterator<Column> itColumns = (Iterator<Column>)fk.columnIterator(); @@ -142,10 +142,10 @@ @SuppressWarnings("unchecked") protected void refreshComponentReferences(ComponentShape componentShape) { Property property = (Property)componentShape.getOrmElement(); - if (!(property.getValue() instanceof CollectionStub)) { + if (!(property.getValue() instanceof Collection)) { return; } - CollectionStub collection = (CollectionStub)property.getValue(); + Collection collection = (Collection)property.getValue(); Value component = collection.getElement(); Shape csChild0 = null, csChild1 = null; Iterator<Shape> tmp = componentShape.getChildrenIterator(); @@ -231,7 +231,7 @@ } @SuppressWarnings("unchecked") - protected OrmShape getOrCreateDatabaseTable(TableStub databaseTable) { + protected OrmShape getOrCreateDatabaseTable(Table databaseTable) { OrmShape tableShape = null; if (databaseTable != null) { tableShape = getShape(databaseTable); @@ -257,7 +257,7 @@ } protected OrmShape getOrCreatePersistentClass(PersistentClass persistentClass, - TableStub componentClassDatabaseTable) { + Table componentClassDatabaseTable) { OrmShape classShape = null; if (persistentClass == null) { return classShape; @@ -291,7 +291,7 @@ subclassShape = createShape(subclass); } if (((Subclass)element).isJoinedSubclass()) { - TableStub jcTable = ((Subclass)element).getTable(); + Table jcTable = ((Subclass)element).getTable(); OrmShape jcTableShape = getOrCreateDatabaseTable(jcTable); createConnections(subclassShape, jcTableShape); if (shouldCreateConnection(subclassShape, jcTableShape)) { @@ -357,8 +357,8 @@ if (property == null) { return classShape; } - if (property.getValue() instanceof CollectionStub) { - Component component = (Component)((CollectionStub)property.getValue()).getElement(); + if (property.getValue() instanceof Collection) { + Component component = (Component)((Collection)property.getValue()).getElement(); if (component != null) { classShape = createShape(property); OrmShape tableShape = elements.get(Utils.getTableName(component.getTable())); @@ -389,7 +389,7 @@ protected OrmShape getOrCreateAssociationClass(Property property) { OrmShape classShape = null; - OneToMany component = (OneToMany)(((CollectionStub)(property.getValue())).getElement()); + OneToMany component = (OneToMany)(((Collection)(property.getValue())).getElement()); if (component == null) { return classShape; } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmDiagram.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -52,7 +52,7 @@ import org.hibernate.eclipse.console.utils.ProjectUtils; import org.hibernate.mediator.x.cfg.Configuration; import org.hibernate.mediator.x.mapping.RootClass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.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.model.Connection.ConnectionType; @@ -1042,7 +1042,7 @@ while (it.hasNext()) { final OrmShape shape = it.next(); Object ormElement = shape.getOrmElement(); - if (ormElement instanceof TableStub) { + if (ormElement instanceof Table) { nTables++; } } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmShape.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmShape.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/OrmShape.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -17,7 +17,7 @@ import org.eclipse.ui.IMemento; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.TextPropertyDescriptor; -import org.hibernate.mediator.x.mapping.CollectionStub; +import org.hibernate.mediator.x.mapping.Collection; import org.hibernate.mediator.x.mapping.Column; import org.hibernate.mediator.x.mapping.Component; import org.hibernate.mediator.x.mapping.KeyValue; @@ -25,7 +25,7 @@ import org.hibernate.mediator.x.mapping.RootClass; import org.hibernate.mediator.x.mapping.SimpleValue; import org.hibernate.mediator.x.mapping.Subclass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.rulers.DiagramGuide; /** @@ -192,7 +192,7 @@ Shape bodyOrmShape = null; if (field.getValue().isSimpleValue() && !((SimpleValue)field.getValue()).isTypeSpecified()) { bodyOrmShape = new Shape(field); - } else if (typeIsAccessible && field.getValue() instanceof CollectionStub) { + } else if (typeIsAccessible && field.getValue() instanceof Collection) { bodyOrmShape = new ComponentShape(field); } else if (typeIsAccessible && field.getValue().getType().isEntityType()) { bodyOrmShape = new ExpandableShape(field); @@ -283,8 +283,8 @@ } } } - } else if (ormElement instanceof TableStub) { - Iterator<Column> iterator = ((TableStub)getOrmElement()).getColumnIterator(); + } else if (ormElement instanceof Table) { + Iterator<Column> iterator = ((Table)getOrmElement()).getColumnIterator(); while (iterator.hasNext()) { Column column = iterator.next(); Shape bodyOrmShape = new Shape(column); @@ -445,7 +445,7 @@ res = descriptors_entity; } else if (ormElement instanceof Subclass) { //RootClass rootClass = ((Subclass)ormElement).getRootClass(); - } else if (ormElement instanceof TableStub) { + } else if (ormElement instanceof Table) { //Iterator iterator = ((Table)getOrmElement()).getColumnIterator(); //while (iterator.hasNext()) { // Column column = (Column)iterator.next(); @@ -461,14 +461,14 @@ public Object getPropertyValue(Object propertyId) { Object res = null; RootClass rootClass = null; - TableStub table = null; + Table table = null; Object ormElement = getOrmElement(); if (ormElement instanceof RootClass) { rootClass = (RootClass)ormElement; } else if (ormElement instanceof Subclass) { //rootClass = ((Subclass)ormElement).getRootClass(); - } else if (ormElement instanceof TableStub) { - table = (TableStub)getOrmElement(); + } else if (ormElement instanceof Table) { + table = (Table)getOrmElement(); } if (rootClass != null) { if (ENTITY_isAbstract.equals(propertyId)) { Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialRootClass.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialRootClass.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/SpecialRootClass.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -12,7 +12,7 @@ import java.util.Iterator; -import org.hibernate.mediator.x.mapping.CollectionStub; +import org.hibernate.mediator.x.mapping.Collection; import org.hibernate.mediator.x.mapping.Component; import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.Property; @@ -45,8 +45,8 @@ return; } Component component = null; - if (property.getValue() instanceof CollectionStub) { - CollectionStub collection = (CollectionStub)property.getValue(); + if (property.getValue() instanceof Collection) { + Collection collection = (Collection)property.getValue(); component = (Component)collection.getElement(); } else if (property.getValue() instanceof Component) { component = (Component)property.getValue(); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Utils.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Utils.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/model/Utils.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -17,7 +17,7 @@ import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.Property; import org.hibernate.mediator.x.mapping.SimpleValue; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; /** * Some common model utils. @@ -53,8 +53,8 @@ } else { res = rootClass.getClassName(); } - } else if (obj instanceof TableStub) { - res = getTableName((TableStub)obj); + } else if (obj instanceof Table) { + res = getTableName((Table)obj); } else if (obj instanceof Property) { Property property = (Property)obj; res = property.getPersistentClass().getEntityName() + "." + property.getName(); //$NON-NLS-1$ @@ -77,7 +77,7 @@ return (catalog != null ? catalog + "." : "") + (schema != null ? schema + "." : "") + name; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ } - public static String getTableName(TableStub table) { + public static String getTableName(Table table) { return getTableName(table.getCatalog(), table.getSchema(), table.getName()); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ConnectionEditPart.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ConnectionEditPart.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ConnectionEditPart.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -28,7 +28,7 @@ import org.hibernate.mediator.x.mapping.Property; import org.hibernate.mediator.x.mapping.RootClass; import org.hibernate.mediator.x.mapping.Subclass; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.editors.figures.RoundPolylineConnection; import org.jboss.tools.hibernate.ui.diagram.editors.model.Connection; import org.jboss.tools.hibernate.ui.diagram.editors.model.BaseElement; @@ -98,7 +98,7 @@ Object el = getTargetElement(); if (el instanceof RootClass || el instanceof Subclass) { return ResourceManager.getInstance().getColor(new RGB(210, 155, 100)); - } else if (el instanceof Column || el instanceof TableStub || el instanceof Property) { + } else if (el instanceof Column || el instanceof Table || el instanceof Property) { return ResourceManager.getInstance().getColor(new RGB(160, 160, 160)); } return ResourceManager.getInstance().getColor(new RGB(255, 0, 0)); @@ -108,7 +108,7 @@ Object el = getTargetElement(); if (el instanceof RootClass || el instanceof Subclass) { return ResourceManager.getInstance().getColor(new RGB(112, 161, 99)); - } else if (el instanceof Column || el instanceof TableStub || + } else if (el instanceof Column || el instanceof Table || el instanceof Component) { return ResourceManager.getInstance().getColor(new RGB(66, 173, 247)); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/OrmShapeEditPart.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -23,7 +23,7 @@ import org.hibernate.mediator.x.mapping.Component; import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.Property; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.editors.figures.TitleFigure; import org.jboss.tools.hibernate.ui.diagram.editors.model.BaseElement; import org.jboss.tools.hibernate.ui.diagram.editors.model.ExpandableShape; @@ -124,7 +124,7 @@ if (element instanceof PersistentClass || element instanceof Component) { return ResourceManager.getInstance().getColor(new RGB(0, 0, 0)); - } else if (element instanceof TableStub || element instanceof Property) { + } else if (element instanceof Table || element instanceof Property) { return ResourceManager.getInstance().getColor(new RGB( Integer.parseInt(ColorConstants.Colors_DatabaseColumnR), Integer.parseInt(ColorConstants.Colors_DatabaseColumnG), Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/parts/ShapeEditPart.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -40,7 +40,7 @@ import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.Property; import org.hibernate.mediator.x.mapping.SimpleValue; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.editors.figures.TitleFigure; import org.jboss.tools.hibernate.ui.diagram.editors.figures.TopLineBorder; import org.jboss.tools.hibernate.ui.diagram.editors.model.Connection; @@ -311,7 +311,7 @@ Integer.parseInt(ColorConstants.Colors_DatabaseColumnR), Integer.parseInt(ColorConstants.Colors_DatabaseColumnG), Integer.parseInt(ColorConstants.Colors_DatabaseColumnB))); - else if (el instanceof TableStub) + else if (el instanceof Table) return ResourceManager.getInstance().getColor(new RGB( Integer.parseInt(ColorConstants.Colors_DatabaseTableR), Integer.parseInt(ColorConstants.Colors_DatabaseTableG), @@ -335,7 +335,7 @@ if (el instanceof PersistentClass || el instanceof Property || el instanceof SimpleValue || el instanceof OneToMany) { return ResourceManager.getInstance().getColor(new RGB(112, 161, 99)); - } else if (el instanceof TableStub || el instanceof Column) { + } else if (el instanceof Table || el instanceof Column) { return ResourceManager.getInstance().getColor(new RGB(66, 173, 247)); } return ResourceManager.getInstance().getColor(new RGB(255, 0, 0)); Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/diagram/editors/popup/PopupMenuProvider.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -30,7 +30,7 @@ import org.hibernate.mediator.x.mapping.Column; import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.Property; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.jboss.tools.hibernate.ui.diagram.editors.actions.AutoLayoutAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.ExportImageAction; import org.jboss.tools.hibernate.ui.diagram.editors.actions.OpenMappingAction; @@ -90,7 +90,7 @@ Object first = selectedShape.getOrmElement(); if (first instanceof PersistentClass || first.getClass() == Property.class - || first instanceof TableStub + || first instanceof Table || first instanceof Column) { action = getActionRegistry().getAction(OpenSourceAction.ACTION_ID); appendToGroup(GROUP_OPEN_SOURCE, action); @@ -115,7 +115,7 @@ if (null != obj && obj instanceof OrmShape) { selectedShape = (Shape)obj; Object first = selectedShape.getOrmElement(); - if (first instanceof PersistentClass || first instanceof TableStub) { + if (first instanceof PersistentClass || first instanceof Table) { addToggleVisibleStateMenu = true; } } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/HibernateUtils.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/HibernateUtils.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/HibernateUtils.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -14,7 +14,7 @@ import org.hibernate.mediator.x.mapping.Column; import org.hibernate.mediator.x.mapping.ForeignKey; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; /** * @author some modifications from Vitali @@ -22,7 +22,7 @@ public class HibernateUtils { public static boolean isPrimaryKey(Column column) { - TableStub table = getTable(column); + Table table = getTable(column); if (table != null) { if (table.getPrimaryKey() != null) { if (table.getPrimaryKey().containsColumn(column)) { @@ -34,7 +34,7 @@ } public static boolean isForeignKey(Column column) { - TableStub table = getTable(column); + Table table = getTable(column); if (table != null) { Iterator<ForeignKey> iter = table.getForeignKeyIterator(); while (iter.hasNext()) { @@ -48,7 +48,7 @@ } - public static TableStub getTable(Column column) { + public static Table getTable(Column column) { if (column.getValue() != null) { return column.getValue().getTable(); } Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmImageMap.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmImageMap.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmImageMap.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -18,17 +18,17 @@ import org.hibernate.mediator.x.mapping.Component; import org.hibernate.mediator.x.mapping.DependantValue; import org.hibernate.mediator.x.mapping.IdentifierBag; -import org.hibernate.mediator.x.mapping.ListStub; +import org.hibernate.mediator.x.mapping.List; import org.hibernate.mediator.x.mapping.ManyToOne; -import org.hibernate.mediator.x.mapping.MapStub; +import org.hibernate.mediator.x.mapping.Map; import org.hibernate.mediator.x.mapping.OneToMany; import org.hibernate.mediator.x.mapping.OneToOne; import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.PrimitiveArray; import org.hibernate.mediator.x.mapping.Property; -import org.hibernate.mediator.x.mapping.SetStub; +import org.hibernate.mediator.x.mapping.Set; import org.hibernate.mediator.x.mapping.SimpleValue; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.hibernate.mediator.x.mapping.Value; import org.hibernate.mediator.x.type.Type; import org.jboss.tools.hibernate.ui.diagram.UiPlugin; @@ -42,8 +42,8 @@ public static ImageDescriptor getImageDescriptor(final Object obj) { String imageName = null; - if (obj instanceof TableStub) { - imageName = getImageName((TableStub)obj); + if (obj instanceof Table) { + imageName = getImageName((Table)obj); } else if (obj instanceof Column) { imageName = getImageName((Column)obj); } else if (obj instanceof Property) { @@ -66,7 +66,7 @@ * @param table * @return */ - public static String getImageName(TableStub table) { + public static String getImageName(Table table) { return "Image_DatabaseTable"; //$NON-NLS-1$ } @@ -80,7 +80,7 @@ String str = "Image_DatabaseColumn"; //$NON-NLS-1$ final boolean primaryKey = HibernateUtils.isPrimaryKey(column); final boolean foreignKey = HibernateUtils.isForeignKey(column); - final TableStub table = HibernateUtils.getTable(column); + final Table table = HibernateUtils.getTable(column); if (column.isUnique()) { str = "Image_DatabaseUniqueKeyColumn"; //$NON-NLS-1$ } else if (primaryKey && table != null && foreignKey) { @@ -132,11 +132,11 @@ str = "Image_Collection_primitive_array"; //$NON-NLS-1$ } else if (value instanceof Array) { str = "Image_Collection_array"; //$NON-NLS-1$ - } else if (value instanceof ListStub) { + } else if (value instanceof List) { str = "Image_Collection_list"; //$NON-NLS-1$ - } else if (value instanceof SetStub) { + } else if (value instanceof Set) { str = "Image_Collection_set"; //$NON-NLS-1$ - } else if (value instanceof MapStub) { + } else if (value instanceof Map) { str = "Image_Collection_map"; //$NON-NLS-1$ } else if (value instanceof Bag) { str = "Image_Collection_bag"; //$NON-NLS-1$ Modified: branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelMap.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelMap.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/plugins/org.jboss.tools.hibernate.ui/src/org/jboss/tools/hibernate/ui/view/OrmLabelMap.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -18,7 +18,7 @@ import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.Property; import org.hibernate.mediator.x.mapping.SimpleValue; -import org.hibernate.mediator.x.mapping.TableStub; +import org.hibernate.mediator.x.mapping.Table; import org.hibernate.mediator.x.mapping.Value; import org.hibernate.mediator.x.type.Type; import org.jboss.tools.hibernate.ui.diagram.editors.model.Utils; @@ -36,8 +36,8 @@ public static String getLabel(final Object obj) { String label = null; - if (obj instanceof TableStub) { - label = getParticularLabel((TableStub)obj); + if (obj instanceof Table) { + label = getParticularLabel((Table)obj); } else if (obj instanceof Column) { label = getParticularLabel((Column)obj); } else if (obj instanceof Property) { @@ -59,7 +59,7 @@ return label; } - public static String getParticularLabel(TableStub table) { + public static String getParticularLabel(Table table) { return Utils.getTableName(table); } @@ -160,7 +160,7 @@ StringBuffer name = new StringBuffer(); name.append(persistentClass.getEntityName() != null ? persistentClass.getEntityName() : persistentClass.getClassName()); - TableStub table = persistentClass.getTable(); + Table table = persistentClass.getTable(); if (table != null) { final String tableName = Utils.getTableName(table); if (tableName != null) { Modified: branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/hbmexporter/HbmExporterTest.java =================================================================== --- branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/hbmexporter/HbmExporterTest.java 2010-05-07 12:30:15 UTC (rev 21953) +++ branches/hibernatetools-multiversion/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/src/org/hibernate/eclipse/jdt/ui/test/hbmexporter/HbmExporterTest.java 2010-05-07 13:51:18 UTC (rev 21954) @@ -31,14 +31,11 @@ import org.hibernate.eclipse.jdt.ui.wizards.ConfigurationActor; import org.hibernate.mediator.x.cfg.Configuration; import org.hibernate.mediator.x.mapping.Array; -import org.hibernate.mediator.x.mapping.ListStub; import org.hibernate.mediator.x.mapping.ManyToOne; -import org.hibernate.mediator.x.mapping.MapStub; import org.hibernate.mediator.x.mapping.OneToMany; import org.hibernate.mediator.x.mapping.PersistentClass; import org.hibernate.mediator.x.mapping.PrimitiveArray; import org.hibernate.mediator.x.mapping.Property; -import org.hibernate.mediator.x.mapping.SetStub; import org.hibernate.mediator.x.mapping.Value; import org.hibernate.mediator.x.type.IntegerType; @@ -163,8 +160,8 @@ Value value = listProp.getValue(); assertNotNull(value); assertTrue("Expected to get List-type mapping", //$NON-NLS-1$ - value.getClass()==ListStub.class); - ListStub list = (ListStub)value; + value.getClass()==List.class); + org.hibernate.mediator.x.mapping.List list = (org.hibernate.mediator.x.mapping.List)value; assertTrue(list.getElement() instanceof OneToMany); assertTrue(list.getCollectionTable().Obj().equals(b.getTable().Obj())); assertNotNull(list.getIndex()); @@ -181,8 +178,8 @@ Value value = setProp.getValue(); assertNotNull(value); assertTrue("Expected to get Set-type mapping", //$NON-NLS-1$ - value.getClass()==SetStub.class); - SetStub set = (SetStub)value; + value.getClass()==Set.class); + org.hibernate.mediator.x.mapping.Set set = (org.hibernate.mediator.x.mapping.Set)value; assertTrue(set.getElement() instanceof OneToMany); assertTrue(set.getCollectionTable().Obj().equals(b.getTable().Obj())); assertNotNull(set.getKey()); @@ -198,8 +195,8 @@ Value value = mapValue.getValue(); assertNotNull(value); assertTrue("Expected to get Map-type mapping", //$NON-NLS-1$ - value.getClass()==MapStub.class); - MapStub map = (MapStub)value; + value.getClass()==Map.class); + org.hibernate.mediator.x.mapping.Map map = (org.hibernate.mediator.x.mapping.Map)value; assertTrue(map.getElement() instanceof OneToMany); assertTrue(map.getCollectionTable().Obj().equals(b.getTable().Obj())); assertNotNull(map.getKey());

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21953 - in branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/projects/Test: esb-1.2 and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-05-07 08:30:15 -0400 (Fri, 07 May 2010) New Revision: 21953 Added: branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/ branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/jboss-esb-notifiers.xml Log: https://jira.jboss.org/jira/browse/JBIDE-6260 Added: branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/jboss-esb-notifiers.xml =================================================================== --- branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/jboss-esb-notifiers.xml (rev 0) +++ branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/jboss-esb-notifiers.xml 2010-05-07 12:30:15 UTC (rev 21953) @@ -0,0 +1,30 @@ +<?xml version="1.0"?> +<jbossesb + xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml..." + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml... http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml..."> + <globals> + <war-security domain="bb" method="DIGEST"/> + </globals> + <services> + <service category="c" description="d" name="s"> + <actions mep="RequestResponse"> + <action class="org.jboss.soa.esb.actions.Notifier" name="SendResponseNotifier"> + <property name="okMethod" value="notifyOK"/> + <property name="exceptionMethod" value="notifyError"/> + <property name="destinations"> + <NotificationList type="err"> + <target class="NotifyQueues"> + <queue jndiName="queue/MincomJMS_reply"/> + </target> + </NotificationList> + <NotificationList type="ok"> + <target class="NotifyQueues"> + <queue jndiName="queue/MincomJMS_reply"/> + </target> + </NotificationList> + </property> + </action> + </actions> + </service> + </services> +</jbossesb> Property changes on: branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/jboss-esb-notifiers.xml ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21952 - trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console.

by jbosstools-commits＠lists.jboss.org

Author: vyemialyanchyk Date: 2010-05-07 07:24:41 -0400 (Fri, 07 May 2010) New Revision: 21952 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java Log: https://jira.jboss.org/jira/browse/JBIDE-5997 - fix in trunk Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-05-07 11:11:55 UTC (rev 21951) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse/src/org/hibernate/console/ConsoleConfiguration.java 2010-05-07 11:24:41 UTC (rev 21952) @@ -156,8 +156,6 @@ Map<Object,Object> overrides = new HashMap<Object,Object>(); if(properties!=null) { overrides.putAll( properties ); - } else { - overrides.put("hibernate.search.autoregister_listeners", "false"); //$NON-NLS-1$ //$NON-NLS-2$ } if(StringHelper.isNotEmpty( prefs.getNamingStrategy())) { overrides.put( "hibernate.ejb.naming_strategy", prefs.getNamingStrategy() ); //$NON-NLS-1$ @@ -187,6 +185,13 @@ throw new HibernateConsoleRuntimeException(out); } + method = clazz.getMethod("getProperties", new Class[] {}); //$NON-NLS-1$ + Properties props = (Properties)method.invoke(ejb3cfg, new Object[] {} ); + if (props.getProperty("hibernate.search.autoregister_listeners") == null) { //$NON-NLS-1$ + method = clazz.getMethod("setProperty", new Class[] { String.class, String.class }); //$NON-NLS-1$ + method.invoke(ejb3cfg, new Object[] { "hibernate.search.autoregister_listeners", "false" } ); //$NON-NLS-1$ //$NON-NLS-2$ + } + method = clazz.getMethod("getHibernateConfiguration", new Class[0]);//$NON-NLS-1$ Configuration invoke = (Configuration) method.invoke(ejb3cfg, (Object[])null); invoke = configureConnectionProfile(invoke); @@ -749,7 +754,9 @@ if(properties!=null) { localCfg = localCfg.setProperties(properties); } else { - localCfg.setProperty("hibernate.search.autoregister_listeners", "false"); //$NON-NLS-1$ //$NON-NLS-2$ + if (localCfg.getProperty("hibernate.search.autoregister_listeners") == null) { //$NON-NLS-1$ + localCfg.setProperty("hibernate.search.autoregister_listeners", "false"); //$NON-NLS-1$ //$NON-NLS-2$ + } } EntityResolver entityResolver = XMLHelper.DEFAULT_DTD_RESOLVER; if(StringHelper.isNotEmpty(prefs.getEntityResolverName())) {

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21951 - in branches/jbosstools-3.1.x/jsf: tests/org.jboss.tools.jsf.text.ext.test/projects/numberguess/web and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: dazarov Date: 2010-05-07 07:11:55 -0400 (Fri, 07 May 2010) New Revision: 21951 Modified: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ExpressionHyperlink.java branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/numberguess/web/giveup.jspx branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java Log: https://jira.jboss.org/jira/browse/JBIDE-6179 Modified: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ExpressionHyperlink.java =================================================================== --- branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ExpressionHyperlink.java 2010-05-07 11:09:41 UTC (rev 21950) +++ branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/ExpressionHyperlink.java 2010-05-07 11:11:55 UTC (rev 21951) @@ -40,7 +40,10 @@ ELInvocationExpression invocationExpression = JSPExprHyperlinkPartitioner.getInvocationExpression(eStructure.reference, eStructure.expression, offset); if(invocationExpression != null){ for(ELResolver resolver : context.getElResolvers()){ - ELResolution resolution = resolver.resolve(context, invocationExpression, invocationExpression.getStartPosition()); + ELResolution resolution = resolver.resolve(context, invocationExpression, offset); + if(resolution==null) { + return null; + } ELSegment segment = resolution.findSegmentByOffset(offset-eStructure.reference.getStartPosition()); if(segment != null){ if(segment instanceof JavaMemberELSegment){ Modified: branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java =================================================================== --- branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java 2010-05-07 11:09:41 UTC (rev 21950) +++ branches/jbosstools-3.1.x/jsf/plugins/org.jboss.tools.jsf.text.ext/src/org/jboss/tools/jsf/text/ext/hyperlink/JSPExprHyperlinkPartitioner.java 2010-05-07 11:11:55 UTC (rev 21951) @@ -11,6 +11,7 @@ package org.jboss.tools.jsf.text.ext.hyperlink; import org.eclipse.core.resources.IFile; +import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; import org.jboss.tools.common.el.core.ELReference; import org.jboss.tools.common.el.core.model.ELExpression; @@ -26,6 +27,7 @@ import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkPartitionRecognizer; import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.common.text.ext.util.StructuredModelWrapper; +import org.jboss.tools.jsf.text.ext.JSFExtensionsPlugin; import org.jboss.tools.jst.text.ext.hyperlink.jsp.JSPRootHyperlinkPartitioner; import org.jboss.tools.jst.web.kb.PageContextFactory; @@ -36,10 +38,18 @@ public class JSPExprHyperlinkPartitioner extends AbstractHyperlinkPartitioner implements IHyperlinkPartitionRecognizer, IExclusiblePartitionerRecognition { public static final String JSP_EXPRESSION_PARTITION = "org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION"; //$NON-NLS-1$ public static final String EXPRESSION_PARTITION = "org.jboss.tools.common.text.ext.jsp.EXPRESSION"; //$NON-NLS-1$ + public static final String DOT_EXPRESSION_PARTITION = "org.jboss.tools.common.text.ext.jsp.DOT_EXPRESSION"; //$NON-NLS-1$ + private static final String DOT = "."; + private boolean jspExpression = false; + + private boolean dotExpression = false; protected String getPartitionType() { + if(dotExpression) + return DOT_EXPRESSION_PARTITION; + if(jspExpression) return EXPRESSION_PARTITION; else @@ -72,18 +82,21 @@ private IHyperlinkRegion getRegion(IDocument document, final int offset) { jspExpression = false; + dotExpression = false; ELContext context = getELContext(document); if(context != null){ ExpressionStructure eStructure = getExpression(context, offset); if(eStructure != null){ ELInvocationExpression invocationExpression = getInvocationExpression(eStructure.reference, eStructure.expression, offset); if(invocationExpression != null){ - jspExpression = decide(context, eStructure.expression, invocationExpression, offset-eStructure.reference.getStartPosition()); + jspExpression = decide(context, eStructure.expression, invocationExpression, offset-eStructure.reference.getStartPosition(), offset); if(jspExpression){ IHyperlinkRegion region = new HyperlinkRegion(invocationExpression.getStartPosition(), invocationExpression.getLength(), null, null, null); return region; } } + dotExpression = checkDot(document, offset, context, eStructure.expression, invocationExpression, offset-eStructure.reference.getStartPosition()); + IHyperlinkRegion region = new HyperlinkRegion(eStructure.expression.getStartPosition(), eStructure.expression.getLength(), null, null, null); return region; } @@ -127,11 +140,14 @@ return null; } - public boolean decide(ELContext context, ELExpression expression, ELInvocationExpression invocationExpression, int offset){ + public boolean decide(ELContext context, ELExpression expression, ELInvocationExpression invocationExpression, int offset, int globalOffset){ for(ELResolver resolver : context.getElResolvers()){ - ELResolution resolution = resolver.resolve(context, invocationExpression, invocationExpression.getStartPosition()); + ELResolution resolution = resolver.resolve(context, invocationExpression, globalOffset); + if(resolution==null) { + return false; + } ELSegment segment = resolution.findSegmentByOffset(offset); - if(segment != null){ + if(segment != null && segment.isResolved()){ if(segment instanceof JavaMemberELSegment){ JavaMemberELSegment javaSegment = (JavaMemberELSegment)segment; if(javaSegment.getJavaElement() != null){ @@ -143,6 +159,21 @@ return false; } + public boolean checkDot(IDocument document, int superOffset, ELContext context, ELExpression expression, ELInvocationExpression invocationExpression, int offset){ + try{ + String text = document.get(superOffset, 1); + if(DOT.equals(text)){ + if(decide(context, expression, invocationExpression, offset+1, superOffset+1)) + return true; + else if(decide(context, expression, invocationExpression, offset-1, superOffset-1)) + return true; + } + }catch(BadLocationException ex){ + JSFExtensionsPlugin.log(ex); + } + return false; + } + /** * @see com.ibm.sse.editor.extensions.hyperlink.IHyperlinkPartitionRecognizer#recognize(org.eclipse.jface.text.IDocument, com.ibm.sse.editor.extensions.hyperlink.IHyperlinkRegion) */ Modified: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/numberguess/web/giveup.jspx =================================================================== --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/numberguess/web/giveup.jspx 2010-05-07 11:09:41 UTC (rev 21950) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/projects/numberguess/web/giveup.jspx 2010-05-07 11:11:55 UTC (rev 21951) @@ -2,6 +2,7 @@ <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" + xmlns:rich="http://richfaces.org/rich" xmlns="http://www.w3.org/1999/xhtml" version="2.0"> <jsp:output doctype-root-element="html" @@ -20,6 +21,9 @@ <h:outputText value="#{Message.info_start}" /><h:outputText value="#{numberGuess.remainingGuesses}"/><h:outputText value="#{Message.info_finish}" /> <h:commandButton value="#{Message.button_yes}" action="yes"/> <h:commandButton value="#{Message.button_no}" action="no"/> + <rich:dataTable value="#{numberGuess.possibilities}" var="_localVariable"> + <h:outputText value="#{_localVariable.intValue}" /> + </rich:dataTable> </h:form> </f:view> </body> Modified: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java =================================================================== --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java 2010-05-07 11:09:41 UTC (rev 21950) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java 2010-05-07 11:11:55 UTC (rev 21951) @@ -32,11 +32,11 @@ import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel; import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument; import org.eclipse.wst.sse.ui.internal.editor.EditorModelUtil; -import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion; import org.jboss.tools.common.text.ext.util.AxisUtil; import org.jboss.tools.jsf.text.ext.hyperlink.JSPExprHyperlinkPartitioner; import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.TestProjectProvider; public class ELExprPartitionerTest extends TestCase { TestProjectProvider provider = null; @@ -118,38 +118,30 @@ HashMap<Object, ArrayList<Region>> recognitionTest = new HashMap<Object, ArrayList<Region>>(); ArrayList<Region> regionList = new ArrayList<Region>(); - regionList.add(new Region(623, 16)); - regionList.add(new Region(706, 16)); - regionList.add(new Region(813, 18)); - regionList.add(new Region(914, 19)); - regionList.add(new Region(972, 18)); - regionList.add(new Region(1041, 17)); + regionList.add(new Region(673, 7)); + regionList.add(new Region(680, 9)); + regionList.add(new Region(756, 7)); + regionList.add(new Region(763, 9)); + regionList.add(new Region(863, 7)); + regionList.add(new Region(870, 11)); + regionList.add(new Region(964, 19)); + regionList.add(new Region(1022, 18)); + regionList.add(new Region(1091, 17)); recognitionTest.put("org.jboss.tools.common.text.ext.jsp.JSP_BUNDLE", regionList); regionList = new ArrayList<Region>(); - regionList.add(new Region(859, 11)); - regionList.add(new Region(871, 16)); - recognitionTest.put("org.jboss.tools.common.text.ext.jsp.JSP_BEAN", regionList); + regionList.add(new Region(920, 1)); + regionList.add(new Region(1168, 1)); + regionList.add(new Region(1251, 1)); + recognitionTest.put("org.jboss.tools.common.text.ext.jsp.DOT_EXPRESSION", regionList); regionList = new ArrayList<Region>(); - regionList.add(new Region(859, 11)); - regionList.add(new Region(871, 16)); - recognitionTest.put("org.jboss.tools.seam.text.ext.SEAM_BEAN", regionList); - - regionList = new ArrayList<Region>(); - regionList.add(new Region(859, 11)); - regionList.add(new Region(870, 16)); - regionList.add(new Region(886, 1)); - - recognitionTest.put("org.jboss.tools.common.text.ext.jsp.JSP_EXPRESSION", regionList); - -// regionList = new ArrayList<Region>(); -// regionList.add(new Region(870, 16)); -// recognitionTest.put("org.eclipse.jst.jsp.SCRIPT.JSP_EL2", regionList); - - regionList = new ArrayList<Region>(); - regionList.add(new Region(859, 11)); - regionList.add(new Region(871, 16)); + regionList.add(new Region(909, 11)); + regionList.add(new Region(921, 16)); + regionList.add(new Region(1157, 11)); + regionList.add(new Region(1169, 13)); + regionList.add(new Region(1237, 14)); + regionList.add(new Region(1252, 8)); recognitionTest.put("org.jboss.tools.common.text.ext.jsp.EXPRESSION", regionList); int counter = 0; @@ -216,7 +208,7 @@ } } - assertEquals("Wrong recognized region count: ", 132, counter); + assertEquals("Wrong recognized region count: ", 180, counter); model.releaseFromEdit(); Modified: branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java =================================================================== --- branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java 2010-05-07 11:09:41 UTC (rev 21950) +++ branches/jbosstools-3.1.x/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/JsfTextExtAllTests.java 2010-05-07 11:11:55 UTC (rev 21951) @@ -17,7 +17,7 @@ public static Test suite() { TestSuite suite = new TestSuite(JsfTextExtAllTests.class.getName()); - //suite.addTest(ELExprPartitionerTest.suite()); + suite.addTest(ELExprPartitionerTest.suite()); return suite; } } \ No newline at end of file

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21950 - branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-05-07 07:09:41 -0400 (Fri, 07 May 2010) New Revision: 21950 Modified: branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6260 Modified: branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java =================================================================== --- branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java 2010-05-07 10:20:47 UTC (rev 21949) +++ branches/jbosstools-3.1.x/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java 2010-05-07 11:09:41 UTC (rev 21950) @@ -250,13 +250,39 @@ assertTrue(errorList.toString(), errorList.length() == 0); } + public void testNotifiers() { + XModelObject object = getFileObject("esb-1.2", "jboss-esb-notifiers.xml", ESBConstants.ENT_ESB_FILE_120); + + StringBuffer errorList = new StringBuffer(); + + String sendResponseNotifierPath = "Services/s/Actions/SendResponseNotifier"; + + String[][] sendResponseNotifierAttrValues = { + {"name", "SendResponseNotifier"}, + {"ok method", "notifyOK"}, + {"exception method", "notifyError"}, + }; + checkAttributes(object, sendResponseNotifierPath, sendResponseNotifierAttrValues, errorList); + String errQueuePath = sendResponseNotifierPath + "/err/NotifyQueues/queue#MincomJMS_reply"; + String[][] errQueueAttrValues = { + {"jndi name", "queue/MincomJMS_reply"}, + }; + checkAttributes(object, errQueuePath, errQueueAttrValues, errorList); + + assertTrue(errorList.toString(), errorList.length() == 0); + } + XModelObject getFileObject(String parentPath, String xmlname) { + return getFileObject(parentPath, xmlname, ESBConstants.ENT_ESB_FILE_101); + } + + XModelObject getFileObject(String parentPath, String xmlname, String entity) { IFile f = project.getFile(new Path(parentPath + "/" + xmlname)); assertTrue("Cannot find " + xmlname, f != null); XModelObject object = EclipseResourceUtil.createObjectForResource(f); assertTrue("Cannot create model for " + xmlname, object != null); - assertTrue("Wrong entity for " + xmlname, ESBConstants.ENT_ESB_FILE_101.equals(object.getModelEntity().getName())); + assertTrue("Wrong entity for " + xmlname, entity.equals(object.getModelEntity().getName())); return object; }

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21949 - in trunk/esb/tests/org.jboss.tools.esb.core.test: projects/Test/esb-1.2 and 1 other directories.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-05-07 06:20:47 -0400 (Fri, 07 May 2010) New Revision: 21949 Added: trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/ trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/jboss-esb-notifiers.xml Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-6260 Added: trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/jboss-esb-notifiers.xml =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/jboss-esb-notifiers.xml (rev 0) +++ trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/jboss-esb-notifiers.xml 2010-05-07 10:20:47 UTC (rev 21949) @@ -0,0 +1,30 @@ +<?xml version="1.0"?> +<jbossesb + xmlns="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml..." + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml... http://anonsvn.labs.jboss.com/labs/jbossesb/trunk/product/etc/schemas/xml..."> + <globals> + <war-security domain="bb" method="DIGEST"/> + </globals> + <services> + <service category="c" description="d" name="s"> + <actions mep="RequestResponse"> + <action class="org.jboss.soa.esb.actions.Notifier" name="SendResponseNotifier"> + <property name="okMethod" value="notifyOK"/> + <property name="exceptionMethod" value="notifyError"/> + <property name="destinations"> + <NotificationList type="err"> + <target class="NotifyQueues"> + <queue jndiName="queue/MincomJMS_reply"/> + </target> + </NotificationList> + <NotificationList type="ok"> + <target class="NotifyQueues"> + <queue jndiName="queue/MincomJMS_reply"/> + </target> + </NotificationList> + </property> + </action> + </actions> + </service> + </services> +</jbossesb> Property changes on: trunk/esb/tests/org.jboss.tools.esb.core.test/projects/Test/esb-1.2/jboss-esb-notifiers.xml ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java 2010-05-07 10:08:52 UTC (rev 21948) +++ trunk/esb/tests/org.jboss.tools.esb.core.test/src/org/jboss/tools/esb/core/test/ESBModelTest.java 2010-05-07 10:20:47 UTC (rev 21949) @@ -250,13 +250,39 @@ assertTrue(errorList.toString(), errorList.length() == 0); } + public void testNotifiers() { + XModelObject object = getFileObject("esb-1.2", "jboss-esb-notifiers.xml", ESBConstants.ENT_ESB_FILE_120); + + StringBuffer errorList = new StringBuffer(); + + String sendResponseNotifierPath = "Services/s/Actions/SendResponseNotifier"; + + String[][] sendResponseNotifierAttrValues = { + {"name", "SendResponseNotifier"}, + {"ok method", "notifyOK"}, + {"exception method", "notifyError"}, + }; + checkAttributes(object, sendResponseNotifierPath, sendResponseNotifierAttrValues, errorList); + String errQueuePath = sendResponseNotifierPath + "/err/NotifyQueues/queue#MincomJMS_reply"; + String[][] errQueueAttrValues = { + {"jndi name", "queue/MincomJMS_reply"}, + }; + checkAttributes(object, errQueuePath, errQueueAttrValues, errorList); + + assertTrue(errorList.toString(), errorList.length() == 0); + } + XModelObject getFileObject(String parentPath, String xmlname) { + return getFileObject(parentPath, xmlname, ESBConstants.ENT_ESB_FILE_101); + } + + XModelObject getFileObject(String parentPath, String xmlname, String entity) { IFile f = project.getFile(new Path(parentPath + "/" + xmlname)); assertTrue("Cannot find " + xmlname, f != null); XModelObject object = EclipseResourceUtil.createObjectForResource(f); assertTrue("Cannot create model for " + xmlname, object != null); - assertTrue("Wrong entity for " + xmlname, ESBConstants.ENT_ESB_FILE_101.equals(object.getModelEntity().getName())); + assertTrue("Wrong entity for " + xmlname, entity.equals(object.getModelEntity().getName())); return object; }

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21948 - branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-05-07 06:08:52 -0400 (Fri, 07 May 2010) New Revision: 21948 Modified: branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java Log: https://jira.jboss.org/jira/browse/JBIDE-6260 Modified: branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java =================================================================== --- branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java 2010-05-07 10:05:41 UTC (rev 21947) +++ branches/jbosstools-3.1.x/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java 2010-05-07 10:08:52 UTC (rev 21948) @@ -14,6 +14,7 @@ import java.util.Map; import org.jboss.tools.common.meta.XAttribute; +import org.jboss.tools.common.meta.XChild; import org.jboss.tools.common.meta.XModelEntity; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.impl.AnyElementObjectImpl; @@ -120,7 +121,17 @@ } protected String getToChildEntity(XModelObject any, XModelEntity parent) { - return parent.getChildren()[0].getName(); + XChild[] cs = parent.getChildren(); + if(cs.length > 1) { + String tag = any.getAttributeValue("tag"); + if(tag != null) for (XChild c: cs) { + XModelEntity e = c.getMetaModel().getEntity(c.getName()); + if(e != null && tag.equals(e.getXMLSubPath())) { + return e.getName(); + } + } + } + return cs[0].getName(); } protected boolean isRelevantTag(String tag, XModelObject object) {

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21947 - trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters.

by jbosstools-commits＠lists.jboss.org

Author: scabanovich Date: 2010-05-07 06:05:41 -0400 (Fri, 07 May 2010) New Revision: 21947 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java Log: https://jira.jboss.org/jira/browse/JBIDE-6260 Modified: trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java =================================================================== --- trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java 2010-05-07 02:07:57 UTC (rev 21946) +++ trunk/esb/plugins/org.jboss.tools.esb.core/src/org/jboss/tools/esb/core/model/converters/ListConverter.java 2010-05-07 10:05:41 UTC (rev 21947) @@ -14,6 +14,7 @@ import java.util.Map; import org.jboss.tools.common.meta.XAttribute; +import org.jboss.tools.common.meta.XChild; import org.jboss.tools.common.meta.XModelEntity; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.impl.AnyElementObjectImpl; @@ -120,7 +121,17 @@ } protected String getToChildEntity(XModelObject any, XModelEntity parent) { - return parent.getChildren()[0].getName(); + XChild[] cs = parent.getChildren(); + if(cs.length > 1) { + String tag = any.getAttributeValue("tag"); + if(tag != null) for (XChild c: cs) { + XModelEntity e = c.getMetaModel().getEntity(c.getName()); + if(e != null && tag.equals(e.getXMLSubPath())) { + return e.getName(); + } + } + } + return cs[0].getName(); } protected boolean isRelevantTag(String tag, XModelObject object) {

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21946 - in trunk/ws/plugins/org.jboss.tools.ws.ui: src/org/jboss/tools/ws/ui/messages and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: bfitzpat Date: 2010-05-06 22:07:57 -0400 (Thu, 06 May 2010) New Revision: 21946 Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/AddMonitorDialog.java Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/WSTestUtils.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/DelimitedStringList.java trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java Log: OPEN - issue JBIDE-6253: Need a web service tester (JAX-WS and JAX-RS) in the tooling https://jira.jboss.org/jira/browse/JBIDE-6253 Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-05-06 18:19:08 UTC (rev 21945) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/META-INF/MANIFEST.MF 2010-05-07 02:07:57 UTC (rev 21946) @@ -22,7 +22,9 @@ com.ibm.icu, org.apache.axis, javax.xml.soap, - javax.xml.rpc + javax.xml.rpc, + org.eclipse.wst.internet.monitor.core, + org.eclipse.wst.internet.monitor.ui Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.ws.ui, org.jboss.tools.ws.ui.messages, Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-05-06 18:19:08 UTC (rev 21945) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUI.properties 2010-05-07 02:07:57 UTC (rev 21946) @@ -68,13 +68,15 @@ JBossWS_DelimitedStringList_EditValue_Dialog_Message=Specify the updated value below. JAXRSWSTestView_Action_URL_Label=Action URL: +JAXRSWSTestView_Configure_Monitor_Button=Configure Monitor JAXRSWSTestView_HTTP_Method_Label=HTTP Method: JAXRSWSTestView_Invoke_Label=Invoke +JAXRSWSTestView_Open_Monitor_Button=Open Monitor JAXRSWSTestView_Request_Body_Label=Request Body JAXRSWSTestView_Request_Header_Label=Request Header JAXRSWSTestView_Request_Parameters_Label=Request Parameters -JAXRSWSTestView_Results_Body_Label=Results Body -JAXRSWSTestView_Results_Header_Label=Results Header +JAXRSWSTestView_Results_Body_Label=Response Body +JAXRSWSTestView_Results_Header_Label=Response Header JAXRSWSTestView_Service_URL_Label=Service URL: JAXRSWSTestView_Set_Sample_Data_Label=Set Sample Data JAXRSWSTestView_Web_Service_Type_Label=Web Service Type: Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-05-06 18:19:08 UTC (rev 21945) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/messages/JBossWSUIMessages.java 2010-05-07 02:07:57 UTC (rev 21946) @@ -91,8 +91,10 @@ public static String JBossWS_DelimitedStringList_EditValue_Dialog_Title; public static String JBossWS_DelimitedStringList_EditValue_Dialog_Message; public static String JAXRSWSTestView_Action_URL_Label; + public static String JAXRSWSTestView_Configure_Monitor_Button; public static String JAXRSWSTestView_HTTP_Method_Label; public static String JAXRSWSTestView_Invoke_Label; + public static String JAXRSWSTestView_Open_Monitor_Button; public static String JAXRSWSTestView_Request_Body_Label; public static String JAXRSWSTestView_Request_Header_Label; public static String JAXRSWSTestView_Request_Parameters_Label; Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/WSTestUtils.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/WSTestUtils.java 2010-05-06 18:19:08 UTC (rev 21945) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/utils/WSTestUtils.java 2010-05-07 02:07:57 UTC (rev 21946) @@ -35,6 +35,7 @@ */ public class WSTestUtils { + private static Map<?, ?> requestHeaders = null; private static Map<?, ?> resultHeaders = null; private static String EMPTY_STRING = ""; //$NON-NLS-1$ @@ -42,6 +43,10 @@ return WSTestUtils.resultHeaders; } + public static Map<?, ?> getRequestHeaders() { + return WSTestUtils.requestHeaders; + } + /* * Start building the web query. Append parameters to URL */ @@ -92,6 +97,10 @@ // build the complete URL URL url = null; if (query != null) { + // add the ? if there are parameters + if (!address.endsWith("?") && methodType.equalsIgnoreCase("GET") ) { //$NON-NLS-1$//$NON-NLS-2$ + address = address + "?"; //$NON-NLS-1$ + } // add parms to the url if we have some url = new URL(address + query); } else { @@ -116,7 +125,7 @@ // set whether this is a GET or POST httpurlc.setRequestMethod(methodType); - // if we are sending/receiving XML, make sure the connection knows + // if we have headers to add if (headers != null && !headers.isEmpty()) { Iterator<?> iter = headers.entrySet().iterator(); while (iter.hasNext()) { @@ -126,12 +135,15 @@ } } + requestHeaders = httpurlc.getRequestProperties(); + // CONNECT! httpurlc.connect(); // If we are doing a POST and we have some request body to pass along, do it if (requestBody != null && ( methodType.equalsIgnoreCase("POST") //$NON-NLS-1$ || methodType.equalsIgnoreCase("PUT"))) { //$NON-NLS-1$ + requestBody = stripNLsFromXML(requestBody); OutputStreamWriter out = new OutputStreamWriter(httpurlc.getOutputStream()); out.write(requestBody); out.close(); @@ -149,7 +161,7 @@ br.close(); response = sb.toString(); - WSTestUtils.resultHeaders = httpurlc.getHeaderFields(); + resultHeaders = httpurlc.getHeaderFields(); // disconnect explicitly (may not be necessary) httpurlc.disconnect(); @@ -171,7 +183,7 @@ String soapIn = body; /* Use AXIS to call the WS */ - String document = soapIn; + String document = stripNLsFromXML(soapIn); Service service = new Service(); Call call= (Call) service.createCall(); call.setTargetEndpointAddress( new java.net.URL(endpoint) ); @@ -180,7 +192,31 @@ call.setProperty(Call.SOAPACTION_USE_PROPERTY,Boolean.TRUE); call.setProperty(Call.SOAPACTION_URI_PROPERTY,action); } - SOAPEnvelope envelope = call.invoke( new Message(document) ); - return envelope.getBody().toString().replaceAll("><",">\n<");//$NON-NLS-1$ //$NON-NLS-2$ + Message message = new Message(document); + SOAPEnvelope envelope = call.invoke( message ); + System.out.println(envelope.getHeaders().toString()); + + String cleanedUp = stripNLsFromXML(envelope.getBody().toString()); + return cleanedUp; } + + public static String addNLsToXML( String incoming ) { + String outgoing = null; + if (incoming != null) { + outgoing = incoming.replaceAll("><",">\n<");//$NON-NLS-1$ //$NON-NLS-2$ + } + return outgoing; + } + + public static String stripNLsFromXML ( String incoming ) { + String outgoing = null; + if (incoming != null) { + outgoing = incoming.replaceAll(">\n<","><");//$NON-NLS-1$ //$NON-NLS-2$ + if (outgoing.contains("\n"))//$NON-NLS-1$ + outgoing.replaceAll("\n"," ");//$NON-NLS-1$ //$NON-NLS-2$ + if (outgoing.contains("\r"))//$NON-NLS-1$ + outgoing.replaceAll("\r"," ");//$NON-NLS-1$ //$NON-NLS-2$ + } + return outgoing; + } } Added: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/AddMonitorDialog.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/AddMonitorDialog.java (rev 0) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/AddMonitorDialog.java 2010-05-07 02:07:57 UTC (rev 21946) @@ -0,0 +1,18 @@ +package org.jboss.tools.ws.ui.views; + +import org.eclipse.swt.widgets.Shell; +import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitorWorkingCopy; +import org.eclipse.wst.internet.monitor.ui.internal.MonitorDialog; + +@SuppressWarnings("restriction") +public class AddMonitorDialog extends MonitorDialog { + + public AddMonitorDialog(Shell parentShell) { + super(parentShell); + } + + public IMonitorWorkingCopy getMonitor() { + return this.monitor; + } + +} Property changes on: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/AddMonitorDialog.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/DelimitedStringList.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/DelimitedStringList.java 2010-05-06 18:19:08 UTC (rev 21945) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/DelimitedStringList.java 2010-05-07 02:07:57 UTC (rev 21946) @@ -51,12 +51,11 @@ private Button mEditButton; private List mPropsList; private Text mAddText; - private Text mHiddenText; private boolean isReadOnly = false; // current delimiter private String mDelimiter = DELIMITER; - + // Warning private String mWarning = null; @@ -212,35 +211,13 @@ public void widgetSelected(SelectionEvent e) { DelimitedStringList.this.mPropsList.removeAll(); - DelimitedStringList.this.mHiddenText.setText(DelimitedStringList.this.getSelection().trim()); updatePropertyButtons(); } }); } - { - this.mHiddenText = new Text(this, SWT.BORDER); - final GridData gridData = new GridData(); - gridData.horizontalSpan = 2; - this.mHiddenText.setLayoutData(gridData); - this.mHiddenText.setVisible(false); - } updatePropertyButtons(); } - /** - * Add a listener to receive notifications when the property list is - * modified. - * - * @param listener - */ - public void addModifyListener(ModifyListener listener) { - this.mHiddenText.addModifyListener(listener); - } - - public void removeModifyListener(ModifyListener listener) { - this.mHiddenText.removeModifyListener(listener); - } - public void dispose() { super.dispose(); } @@ -258,8 +235,6 @@ if (!isReadOnly){ this.mClearAllButton.setEnabled(true); } - String selected = getSelection(); - this.mHiddenText.setText(selected.trim()); this.mAddText.setSelection(0, this.mAddText.getText().length()); this.mAddText.setFocus(); } @@ -293,9 +268,6 @@ if (this.mPropsList.getSelectionCount() == 1) { int index = this.mPropsList.getSelectionIndex(); this.mPropsList.remove(index); - String selected = getSelection(); - this.mHiddenText.setText(selected.trim()); - try { if (this.mPropsList.getItem(index) != null) { this.mPropsList.select(index); @@ -339,8 +311,6 @@ } } - String selected = getSelection(); - this.mHiddenText.setText(selected.trim()); this.mPropsList.setSelection(destination); } } @@ -380,8 +350,6 @@ counter++; } - String selected = getSelection(); - this.mHiddenText.setText(selected.trim()); this.mPropsList.setSelection(destination); } Modified: trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java =================================================================== --- trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java 2010-05-06 18:19:08 UTC (rev 21945) +++ trunk/ws/plugins/org.jboss.tools.ws.ui/src/org/jboss/tools/ws/ui/views/JAXRSWSTestView.java 2010-05-07 02:07:57 UTC (rev 21946) @@ -10,16 +10,25 @@ ******************************************************************************/ package org.jboss.tools.ws.ui.views; +import java.net.MalformedURLException; +import java.net.URL; import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.Map.Entry; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.jface.window.Window; import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.SashForm; +import org.eclipse.swt.events.KeyEvent; +import org.eclipse.swt.events.KeyListener; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; +import org.eclipse.swt.layout.FillLayout; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; +import org.eclipse.swt.layout.RowLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Combo; import org.eclipse.swt.widgets.Composite; @@ -28,12 +37,18 @@ import org.eclipse.swt.widgets.TabFolder; import org.eclipse.swt.widgets.TabItem; import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.part.ViewPart; +import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitor; +import org.eclipse.wst.internet.monitor.core.internal.provisional.MonitorCore; import org.jboss.tools.ws.ui.messages.JBossWSUIMessages; import org.jboss.tools.ws.ui.utils.WSTestUtils; +@SuppressWarnings("restriction") public class JAXRSWSTestView extends ViewPart { + private static final String TCPIP_VIEW_ID = "org.eclipse.wst.internet.monitor.view";//$NON-NLS-1$ private static final String DELETE = "DELETE";//$NON-NLS-1$ private static final String PUT = "PUT";//$NON-NLS-1$ private static final String POST = "POST";//$NON-NLS-1$ @@ -67,6 +82,8 @@ private TabItem parmsTab; private DelimitedStringList parmsList; + private Button openTCPIPMonitorButton; + private Button addTCPIPMonitorButton; /** * The constructor. @@ -81,13 +98,19 @@ public void createPartControl(Composite parent) { Composite innerComposite = new Composite (parent, SWT.NONE); - innerComposite.setLayout(new GridLayout(2, false)); + innerComposite.setLayout(new FillLayout()); - Label typeLabel = new Label(innerComposite, SWT.NONE); + SashForm sashForm = new SashForm(innerComposite, SWT.BORDER); + sashForm.setOrientation(SWT.HORIZONTAL); + + Composite topHalf = new Composite (sashForm, SWT.NONE); + topHalf.setLayout(new GridLayout(2, false)); + + Label typeLabel = new Label(topHalf, SWT.NONE); typeLabel.setText(JBossWSUIMessages.JAXRSWSTestView_Web_Service_Type_Label); typeLabel.setLayoutData(new GridData()); - wsTypeCombo = new Combo(innerComposite, SWT.DROP_DOWN | SWT.READ_ONLY); + wsTypeCombo = new Combo(topHalf, SWT.DROP_DOWN | SWT.READ_ONLY); wsTypeCombo.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); wsTypeCombo.add(JAX_WS); wsTypeCombo.add(JAX_RS); @@ -97,39 +120,65 @@ } public void widgetSelected(SelectionEvent e) { setControlsForWSType(wsTypeCombo.getText()); + setControlsForMethodType(methodCombo.getText()); + setControlsForSelectedURL(); } }); - Label methodLabel = new Label(innerComposite, SWT.NONE); + Label methodLabel = new Label(topHalf, SWT.NONE); methodLabel.setText(JBossWSUIMessages.JAXRSWSTestView_HTTP_Method_Label); methodLabel.setLayoutData(new GridData()); - methodCombo = new Combo(innerComposite, SWT.DROP_DOWN | SWT.READ_ONLY); + methodCombo = new Combo(topHalf, SWT.DROP_DOWN | SWT.READ_ONLY); methodCombo.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); methodCombo.add(GET); methodCombo.add(POST); methodCombo.add(PUT); methodCombo.add(DELETE); methodCombo.setText(GET); + methodCombo.addSelectionListener(new SelectionListener() { + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + public void widgetSelected(SelectionEvent e) { + setControlsForMethodType(methodCombo.getText()); + } + }); - Label urlLabel = new Label(innerComposite, SWT.NONE); + Label urlLabel = new Label(topHalf, SWT.NONE); urlLabel.setText(JBossWSUIMessages.JAXRSWSTestView_Service_URL_Label); urlLabel.setLayoutData(new GridData()); -// urlText = new Text(innerComposite, SWT.BORDER); -// urlText.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); - - urlCombo = new Combo(innerComposite, SWT.BORDER | SWT.DROP_DOWN); + urlCombo = new Combo(topHalf, SWT.BORDER | SWT.DROP_DOWN); urlCombo.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); + urlCombo.addSelectionListener(new SelectionListener() { + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + public void widgetSelected(SelectionEvent e) { + setControlsForSelectedURL(); + } + }); + urlCombo.addKeyListener(new KeyListener() { + public void keyPressed(KeyEvent e) { + } - Label actionLabel = new Label(innerComposite, SWT.NONE); + public void keyReleased(KeyEvent e) { + setControlsForSelectedURL(); + if (e.keyCode == SWT.CR) { + handleTest(); + } + } + }); + + Label actionLabel = new Label(topHalf, SWT.NONE); actionLabel.setText(JBossWSUIMessages.JAXRSWSTestView_Action_URL_Label); actionLabel.setLayoutData(new GridData()); - actionText = new Text(innerComposite, SWT.BORDER); + actionText = new Text(topHalf, SWT.BORDER); actionText.setLayoutData(new GridData(SWT.FILL, SWT.NONE, true, false)); - tabGroup = new TabFolder(innerComposite, SWT.BORDER); + tabGroup = new TabFolder(topHalf, SWT.BORDER); bodyTab = new TabItem(tabGroup, SWT.NONE, 0); bodyTab.setText(JBossWSUIMessages.JAXRSWSTestView_Request_Body_Label); @@ -150,7 +199,7 @@ bodyTab.setControl(bodyText); headerTab.setText(JBossWSUIMessages.JAXRSWSTestView_Request_Header_Label); - GridData hgGridData = new GridData(SWT.FILL, SWT.NONE, true, false); + GridData hgGridData = new GridData(SWT.FILL, SWT.FILL, true, true); hgGridData.horizontalSpan = 2; tabGroup.setLayoutData(hgGridData); @@ -160,23 +209,14 @@ dlsListGD.horizontalSpan = 2; dlsList.setLayoutData(dlsListGD); -// Button sampleButton = new Button(innerComposite, SWT.PUSH); -// sampleButton.setText(JBossWSUIMessages.JAXRSWSTestView_Set_Sample_Data_Label); -// sampleButton.setLayoutData(new GridData()); -// -// sampleButton.addSelectionListener(new SelectionListener() { -// public void widgetSelected(SelectionEvent e) { -// setupSample(); -// } -// public void widgetDefaultSelected(SelectionEvent e) { -// widgetSelected(e); -// } -// }); + Composite buttonBar = new Composite ( topHalf, SWT.NONE); + GridData buttonBarGD = new GridData(SWT.FILL, SWT.NONE, true, false); + buttonBarGD.horizontalSpan = 2; + buttonBar.setLayoutData(buttonBarGD); + buttonBar.setLayout(new RowLayout()); - GridData buttonGD = new GridData(SWT.BEGINNING, SWT.NONE, false, false); - testButton = new Button (innerComposite, SWT.PUSH); + testButton = new Button (buttonBar, SWT.PUSH); testButton.setText(JBossWSUIMessages.JAXRSWSTestView_Invoke_Label); - testButton.setLayoutData(buttonGD); testButton.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { @@ -187,7 +227,47 @@ } }); - resultTabGroup = new TabFolder(innerComposite, SWT.BORDER); + addTCPIPMonitorButton = new Button(buttonBar, SWT.PUSH); + addTCPIPMonitorButton.setText(JBossWSUIMessages.JAXRSWSTestView_Configure_Monitor_Button); + + addTCPIPMonitorButton.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + configureMonitor(); + } + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + }); + + openTCPIPMonitorButton = new Button(buttonBar, SWT.PUSH); + openTCPIPMonitorButton.setText(JBossWSUIMessages.JAXRSWSTestView_Open_Monitor_Button); + + openTCPIPMonitorButton.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + openMonitor(); + } + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + }); + + Button sampleButton = new Button(buttonBar, SWT.PUSH); + sampleButton.setText(JBossWSUIMessages.JAXRSWSTestView_Set_Sample_Data_Label); + sampleButton.setVisible(false); + + sampleButton.addSelectionListener(new SelectionListener() { + public void widgetSelected(SelectionEvent e) { + setupSample(); + } + public void widgetDefaultSelected(SelectionEvent e) { + widgetSelected(e); + } + }); + + Composite bottomHalf = new Composite (sashForm, SWT.NONE); + bottomHalf.setLayout(new GridLayout(2, false)); + + resultTabGroup = new TabFolder(bottomHalf, SWT.BORDER); GridData rtGridData = new GridData(SWT.FILL, SWT.FILL, true, true); rtGridData.horizontalSpan = 2; resultTabGroup.setLayoutData(rtGridData); @@ -208,8 +288,120 @@ wsTypeCombo.setText(JAX_WS); setControlsForWSType(wsTypeCombo.getText()); + setControlsForMethodType(methodCombo.getText()); + setControlsForSelectedURL(); } + private void setControlsForSelectedURL() { + if (urlCombo.getText().trim().length() > 0) { + testButton.setEnabled(true); + addTCPIPMonitorButton.setEnabled(true); + } else { + testButton.setEnabled(false); + addTCPIPMonitorButton.setEnabled(false); + } + } + + /* + * Open the TCP/IP Monitor View + */ + private void openMonitor() { + try { + PlatformUI.getWorkbench().getActiveWorkbenchWindow(). + getActivePage().showView(TCPIP_VIEW_ID); + } catch (PartInitException e) { + e.printStackTrace(); + } + } + + private IMonitor findMonitor(String urlToCheck) { + IMonitor monitor = null; + + IMonitor[] monitors = MonitorCore.getMonitors(); + if (monitors != null && monitors.length > 0) { + for (int i= 0; i < monitors.length; i++) { + if (urlToCheck.contains(monitors[i].getRemoteHost())) { + monitor = monitors[i]; + break; + } + } + } + return monitor; + } + + /* + * Configure a TCP/IP Monitor entry so we can monitor it + */ + private void configureMonitor() { + if (urlCombo.getText().trim().length() > 0) { + String oldUrl = urlCombo.getText(); + IMonitor monitor = findMonitor(oldUrl); + if (monitor == null) { + + URL tempURL = null; + try { + tempURL = new URL(oldUrl); + } catch (MalformedURLException e) { + // ignore + } + AddMonitorDialog dialog = new AddMonitorDialog(getSite().getShell()); + if (tempURL != null) { + dialog.getMonitor().setRemoteHost(tempURL.getHost()); + if (tempURL.getPort() > 0) + dialog.getMonitor().setRemotePort(tempURL.getPort()); + } + if (dialog.open() == Window.CANCEL) + return; + monitor = dialog.getMonitor(); + } + + if (monitor != null) { + monitor = findMonitor(oldUrl); + if (monitor != null) { + if (!monitor.isRunning()) { + try { + monitor.start(); + } catch (CoreException e) { + // if we hit an error, put it in the results text + resultsText.setText(e.toString()); + e.printStackTrace(); + } + } + + int port = monitor.getLocalPort(); + int remotePort = monitor.getRemotePort(); + String host = monitor.getRemoteHost(); + String newUrl = null; + if (oldUrl.contains(host + ":" + remotePort)) { //$NON-NLS-1$ + newUrl = oldUrl.replace(host + ":" + remotePort, "localhost:" + port); //$NON-NLS-1$ //$NON-NLS-2$ + } else { + newUrl = oldUrl.replace(host, "localhost:" + port); //$NON-NLS-1$ + } + urlCombo.setText(newUrl); + } + } + } + } + + /* + * Enable/disable controls based on the WS technology type + * and the method. + * + * @param methodType + */ + private void setControlsForMethodType ( String methodType ) { + if (wsTypeCombo.getText().equalsIgnoreCase(JAX_RS) && + methodType.equalsIgnoreCase(GET)) { + bodyText.setEnabled(false); + } else { + bodyText.setEnabled(true); + } + } + + /* + * Enable/disable controls based on the WS technology type + * @param wsType + */ private void setControlsForWSType ( String wsType ) { if (wsType.equalsIgnoreCase(JAX_WS)) { actionText.setEnabled(true); @@ -219,6 +411,19 @@ dlsList.setEnabled(false); parmsTab.getControl().setEnabled(false); headerTab.getControl().setEnabled(false); + methodCombo.setText(POST); + + String emptySOAP = "<?xml version=\"1.0\" standalone=\"yes\" ?>" + //$NON-NLS-1$ + "<soap:Envelope xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\" " + //$NON-NLS-1$ + "xmlns:ns=\"INSERT_URL_HERE\">" + //$NON-NLS-1$ + "<soap:Body>" + //$NON-NLS-1$ + "</soap:Body>" + //$NON-NLS-1$ + "</soap:Envelope>"; //$NON-NLS-1$ + emptySOAP = WSTestUtils.addNLsToXML(emptySOAP); + + if (bodyText.getText().trim().length() == 0) { + bodyText.setText(emptySOAP); + } } else if (wsType.equalsIgnoreCase(JAX_RS)) { actionText.setEnabled(false); @@ -228,12 +433,14 @@ dlsList.setEnabled(true); parmsTab.getControl().setEnabled(true); headerTab.getControl().setEnabled(true); + methodCombo.setText(GET); } } /* * Sets up the controls to call a public sample RESTful WS that does - * a postal code lookup. + * a postal code lookup or a JAX-WS service that does a + * Shakespeare lookup. */ private void setupSample() { // go to http://www.geonames.org/export/web-services.html for example @@ -256,6 +463,7 @@ "</ns:GetSpeech>"+ //$NON-NLS-1$ "</soap:Body>" + //$NON-NLS-1$ "</soap:Envelope>"; //$NON-NLS-1$ + soapIn = WSTestUtils.addNLsToXML(soapIn); urlCombo.setText("http://www.xmlme.com/WSShakespeare.asmx"); //$NON-NLS-1$ actionText.setText("http://xmlme.com/WebServices/GetSpeech"); //$NON-NLS-1$ @@ -264,8 +472,14 @@ dlsList.setSelection(EMPTY_STRING); tabGroup.setSelection(bodyTab); } + setControlsForWSType(wsTypeCombo.getText()); + setControlsForMethodType(methodCombo.getText()); + setControlsForSelectedURL(); } + /* + * Actually perform the test based on which type of activity it is + */ private void handleTest() { if (urlCombo.getItemCount() > 0) { java.util.List<String> aList = Arrays.asList(urlCombo.getItems()); @@ -290,7 +504,8 @@ private void handleWSTest() { try { String result = WSTestUtils.invokeWS(urlCombo.getText(), actionText.getText(), bodyText.getText()); - resultsText.setText(result); + String cleanedUp = WSTestUtils.addNLsToXML(result); + resultsText.setText(cleanedUp); resultHeadersList.removeAll(); if (WSTestUtils.getResultHeaders() != null) { @@ -322,8 +537,10 @@ // Is this a GET or POST activity? String method = methodCombo.getText(); - // What's the Request body text? - String body = bodyText.getText(); + // If it's a GET, what's the Request body text? + String body = EMPTY_STRING; + if (method.equalsIgnoreCase(GET)) + body = bodyText.getText(); // if no actual text in the request body, set to null if (body.trim().length() == 0) body = null; @@ -368,7 +585,8 @@ WSTestUtils.callRestfulWebService(address, parameters, headers, method, body); // put the results in the result text field - resultsText.setText(result); + String cleanedUp = WSTestUtils.addNLsToXML(result); + resultsText.setText(cleanedUp); resultHeadersList.removeAll(); Iterator<?> iter = WSTestUtils.getResultHeaders().entrySet().iterator(); @@ -381,7 +599,7 @@ text = text + entry.toString(); resultHeadersList.add(text); } - + } catch (Exception e) { // if we hit an error, put it in the results text

15 years, 11 months

1
0
0 / 0

JBoss Tools SVN: r21945 - in trunk/cdi: plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: akazakov Date: 2010-05-06 14:19:08 -0400 (Thu, 06 May 2010) New Revision: 21945 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java Log: https://jira.jboss.org/jira/browse/JBIDE-2708 Added new CDI validation rule: producer field type contains a wildcard type parameter. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-05-06 18:17:18 UTC (rev 21944) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-05-06 18:19:08 UTC (rev 21945) @@ -32,6 +32,7 @@ import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.core.Signature; import org.eclipse.wst.validation.internal.core.ValidationException; import org.eclipse.wst.validation.internal.provisional.core.IReporter; import org.jboss.tools.cdi.core.CDIConstants; @@ -521,6 +522,20 @@ } } } + /* + * 3.4. Producer fields + * - producer field type contains a wildcard type parameter + */ + Set<ITypeDeclaration> typeDeclarations = producerField.getAllTypeDeclarations(); + if(!typeDeclarations.isEmpty()) { + ITypeDeclaration typeDeclaration = typeDeclarations.iterator().next(); + String[] paramTypes = Signature.getTypeArguments(typeDeclaration.getSignature()); + for (String paramType : paramTypes) { + if((paramType.length()==1 && paramType.charAt(0) == Signature.C_STAR) || paramType.charAt(0) == Signature.C_EXTENDS) { + addError(CDIValidationMessages.PRODUCER_FIELD_TYPE_HAS_WILDCARD, CDIPreferences.PRODUCER_FIELD_TYPE_HAS_WILDCARD, typeDeclaration, producer.getResource()); + } + } + } } else { IProducerMethod producerMethod = (IProducerMethod)producer; List<IParameter> params = producerMethod.getParameters(); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-05-06 18:17:18 UTC (rev 21944) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/preferences/CDIConfigurationBlock.java 2010-05-06 18:19:08 UTC (rev 21945) @@ -43,7 +43,7 @@ CDIPreferencesMessages.CDIValidatorConfigurationBlock_section_type, new String[][]{ {CDIPreferences.ILLEGAL_TYPE_IN_TYPED_DECLARATION, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_illegalTypeInTypedDeclaration_label}, -// {CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_HAS_WILDCARD, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeHasWildcard_label}, + {CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_HAS_WILDCARD, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeHasWildcard_label}, // {CDIPreferences.PRODUCER_METHOD_RETURN_TYPE_IS_VARIABLE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_producerMethodReturnTypeIsVariable_label}, // {CDIPreferences.PRODUCER_FIELD_TYPE_HAS_WILDCARD, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_producerFieldTypeHasWildcard_label}, // {CDIPreferences.PRODUCER_FIELD_TYPE_IS_VARIABLE, CDIPreferencesMessages.CDIValidatorConfigurationBlock_pb_producerFieldTypeIsVariable_label}, Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java 2010-05-06 18:17:18 UTC (rev 21944) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java 2010-05-06 18:19:08 UTC (rev 21945) @@ -18,8 +18,8 @@ import javax.enterprise.inject.Produces; -public class SpiderProducerWildCardType_Broken +public class SpiderProducerWildCardType_Broken<T> { @Produces public FunnelWeaver<?> getAnotherFunnelWeaver = new FunnelWeaver<Object>(); - + @Produces public FunnelWeaver<? extends T> getAnotherFunnelWeaver2; } Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-05-06 18:17:18 UTC (rev 21944) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ValidationTest.java 2010-05-06 18:19:08 UTC (rev 21945) @@ -261,6 +261,18 @@ } /** + * 3.4. Producer fields + * - producer field type contains a wildcard type parameter + * + * @throws Exception + */ + public void testParameterizedReturnTypeWithWildcard() throws Exception { + IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/broken/parameterizedReturnTypeWithWildcard/SpiderProducerWildCardType_Broken.java"); + AbstractResourceMarkerTest.assertMarkerIsCreatedForGivenPosition(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_FIELD_TYPE_HAS_WILDCARD, 23, 1008, 1033); + AbstractResourceMarkerTest.assertMarkerIsCreatedForGivenPosition(file, AbstractResourceMarkerTest.MARKER_TYPE, CDIValidationMessages.PRODUCER_FIELD_TYPE_HAS_WILDCARD, 24, 10011, 1036); + } + + /** * 3.9.1. Declaring an initializer method * - an initializer method has a parameter annotated @Disposes *

15 years, 11 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits May 2010