Author: mdryakhlenkov Date: 2007-07-05 08:10:59 -0400 (Thu, 05 Jul 2007) New Revision: 2314 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/ui/ Removed: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/com/exadel/orm2/view/ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/com/exadel/orm2/wizard/hibernatecachewizard/ Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/ViewPlugin.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/image.properties trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/ActionOrmTree.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/ContentProviderVisitor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/ObjectEditorInput.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OpenDiagramActionDelegate.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OrmContentProvider.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OrmLabelProvider.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OrmModelImageVisitor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OrmModelNameVisitor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/ViewsAction.java Log: JBIDE-559: Hibernate diagram editor cleanup Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/ViewPlugin.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/ViewPlugin.java 2007-07-05 12:01:50 UTC (rev 2313) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/ViewPlugin.java 2007-07-05 12:10:59 UTC (rev 2314) @@ -8,7 +8,7 @@ * Contributors: * Exadel, Inc. and Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.hibernate.view; +package org.jboss.tools.hibernate.ui.view; import java.io.ByteArrayInputStream; import java.io.IOException; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/image.properties =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/image.properties 2007-07-05 12:01:50 UTC (rev 2313) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/image.properties 2007-07-05 12:10:59 UTC (rev 2314) @@ -91,6 +91,6 @@ TreeModelLabel.file_obj=file_obj.gif TreeModelLabel.fldr_obj=fldr_obj.gif -#VizualMapping -VizualMapping.shevronUp=shevron_up.gif -VizualMapping.shevronDown=shevron_down.gif +#VisualMapping +VisualMapping.shevronUp=shevron_up.gif +VisualMapping.shevronDown=shevron_down.gif Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/ActionOrmTree.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/ActionOrmTree.java 2007-07-05 12:01:50 UTC (rev 2313) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/ActionOrmTree.java 2007-07-05 12:10:59 UTC (rev 2314) @@ -1,14 +1,14 @@ /******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Copyright (c) 2007 Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the * Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate.view.views; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.view.views; import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.TreeViewer; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/ContentProviderVisitor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/ContentProviderVisitor.java 2007-07-05 12:01:50 UTC (rev 2313) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/ContentProviderVisitor.java 2007-07-05 12:10:59 UTC (rev 2314) @@ -1,351 +1,27 @@ /******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Copyright (c) 2007 Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the * Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate.view.views; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.view.views; import java.util.ResourceBundle; import org.hibernate.mapping.Column; -/** - * @author Tau from Minsk - * - */ public class ContentProviderVisitor { private static final Object[] nullChildren = new Object[0]; private ResourceBundle BUNDLE = ResourceBundle.getBundle(ContentProviderVisitor.class.getPackage().getName() + ".views"); -// public Object visitOrmProject(IOrmProject project, Object argument) { -// return project.getMappings(); -// } -// -// public Object visitDatabaseSchema(IDatabaseSchema schema, Object argument) { -// return schema.getDatabaseTables(); -// } -// -// public Object visitDatabaseTable(IDatabaseTable table, Object argument) { -// return table.getColumns(); -// } -// -// public Object visitDatabaseColumn(IDatabaseColumn column, Object argument) { -// return nullChildren; -// } -// -// public Object visitDatabaseConstraint(IDatabaseConstraint constraint, Object argument) { -// return nullChildren; -// } -// -// public Object visitPackage(IPackage pakage, Object argument) { -// return pakage.getPersistentClasses(); -// } -// -// public Object visitMapping(final IMapping mapping, final Object argument) { -// // start job -// if (mapping.isFlagDirty()) { -// //if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("0-ContentProviderVisitor.visitMapping(...), parentElement= " + mapping); -// Job job = new Job(BUNDLE.getString("Job.LoadMapping")) { -// protected IStatus run(IProgressMonitor monitor) { -// ((OrmContentProvider)argument).lockMenu = true; // add tau 09.03.2006 -// mapping.getMappingStorages(); -// return Status.OK_STATUS; -// } -// }; -// -// job.addJobChangeListener(new JobChangeAdapter() { -// public void done(IJobChangeEvent event) { -// if (event.getJob().getState() != Job.NONE) return; // Job not finished -// //if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("1-ContentProviderVisitor.visitMapping(...), parentElement= " + mapping); -// ((OrmContentProvider)argument).lockMenu = false; // add tau 09.03.2006 -// if (event.getResult().isOK()){ -// if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("2-ContentProviderVisitor.visitMapping(...), parentElement= " + mapping); -// ((OrmContentProvider)argument).viewerRefreshUpdate(mapping, false); -// } -// } -// }); -// job.setPriority(Job.INTERACTIVE); -// job.schedule(); // start as soon as possible -// return new String []{BUNDLE.getString("Job.LoadMapping")}; -// } else { -// if (((OrmContentProvider)argument).getTip() == OrmContentProvider.CLASS_FIELD_CONTENT_PROVIDER) return mapping.getPertsistentClasses(); -// else if (((OrmContentProvider)argument).getTip() == OrmContentProvider.PACKAGE_CLASS_FIELD_CONTENT_PROVIDER) return mapping.getPackages(); -// else if (((OrmContentProvider)argument).getTip() == OrmContentProvider.STORAGE_CLASS_FIELD_CONTENT_PROVIDER) return mapping.getMappingStorages(); -// else if (((OrmContentProvider)argument).getTip() == OrmContentProvider.SCHEMA_TABLE_COLUMN_CONTENT_PROVIDER) return mapping.getDatabaseSchemas(); -// else if (((OrmContentProvider)argument).getTip() == OrmContentProvider.TABLE_COLUMN_CONTENT_PROVIDER) return mapping.getDatabaseTables(); -// else return nullChildren; -// } -// -// } -// -// public Object visitMappingStorage(IMappingStorage storage, Object argument) { -// //storage.getNamedQueryMappings(); 26.07.2005 -// //return storage.getPersistentClassMappings(); -// // add tau 27.07.2005 -// Object[] namedQueryMappings = storage.getNamedQueryMappings(); -// Object[] persistentClassMappings = storage.getPersistentClassMappings(); -// Object[] mappings = new Object[namedQueryMappings.length + persistentClassMappings.length]; -// System.arraycopy(namedQueryMappings, 0, mappings, 0, namedQueryMappings.length); -// System.arraycopy(persistentClassMappings, 0, mappings, namedQueryMappings.length, persistentClassMappings.length); -// -// ((OrmContentProvider)argument).setSorting(false); // add 28.07.2005 tau -// return mappings; -// } -// -// public Object visitPersistentClass(IPersistentClass clazz, Object argument) { -// ((OrmContentProvider)argument).setSorting(false); -// return clazz.getFields(); -// } -// -// public Object visitPersistentField(IPersistentField field, Object argument) { -// IPersistentFieldMapping mapping = field.getMapping(); -// if (mapping != null){ -// return mapping.accept(this, argument); -// } -// -// return nullChildren; -// } -// -// public Object visitPersistentClassMapping(IPersistentClassMapping mapping, Object argument) { -// IPersistentClass persistentClass = mapping.getPersistentClass(); -// if (persistentClass != null){ -// ((OrmContentProvider)argument).setSorting(false); -// return persistentClass.getFields(); -// } -// return nullChildren; -// } -// -// public Object visitPersistentFieldMapping(IPersistentFieldMapping mapping, Object argument) { -// IPersistentValueMapping valueMapping = mapping.getPersistentValueMapping(); -// if (valueMapping != null){ -// return valueMapping.accept(this, argument); -// } -// return nullChildren; -// } -// -// public Object visitPersistentValueMapping(IPersistentValueMapping mapping, Object argument) { -// // added by Nick 06.09.2005 -// ((OrmContentProvider)argument).setSorting(false); -// // by Nick -// -// Iterator iter = mapping.getColumnIterator(); -// if (iter != null){ -// ArrayList list = new ArrayList(); -// while (iter.hasNext()) { -// list.add(iter.next()); -// } -// return list.toArray(); -// } -// return nullChildren; -// } -// -// private Object[] visitCollectionMapping(ICollectionMapping mapping, Object argument){ -// IHibernateValueMapping elem=mapping.getElement(); -// // added by Nick 06.09.2005 -// ((OrmContentProvider)argument).setSorting(false); -// // by Nick -// IHibernateValueMapping key=mapping.getKey(); -// return new Object[]{key,elem}; -// } -// private Object[] visitIndexedCollectionMapping(IIndexedCollectionMapping mapping, Object argument){ -// IHibernateValueMapping elem=mapping.getElement(); -// // added by Nick 06.09.2005 -// ((OrmContentProvider)argument).setSorting(false); -// // by Nick -// IHibernateValueMapping key=mapping.getKey(); -// return new Object[]{key, elem, mapping.getIndex()}; -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitAnyMapping(org.jboss.tools.hibernate.core.hibernate.IAnyMapping, java.lang.Object) -// */ -// public Object visitAnyMapping(IAnyMapping mapping, Object argument) { -// return visitPersistentValueMapping(mapping, argument); -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitArrayMapping(org.jboss.tools.hibernate.core.hibernate.IArrayMapping, java.lang.Object) -// */ -// public Object visitArrayMapping(IArrayMapping mapping, Object argument) { -// return visitIndexedCollectionMapping(mapping, argument); -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitBagMapping(org.jboss.tools.hibernate.core.hibernate.IBagMapping, java.lang.Object) -// */ -// public Object visitBagMapping(IBagMapping mapping, Object argument) { -// return visitCollectionMapping(mapping, argument); -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitComponentMapping(org.jboss.tools.hibernate.core.hibernate.IComponentMapping, java.lang.Object) -// */ -// public Object visitComponentMapping(IComponentMapping mapping, Object argument) { -// //changed on 06/07/05 by alex -// ((OrmContentProvider)argument).setSorting(false); -// return mapping.getComponentClass().getFields(); -///* -// * Iterator iter = mapping.getPropertyIterator(); -// if (iter != null){ -// ArrayList list = new ArrayList(); -// while (iter.hasNext()) { -// //added 13.05.2005 by Nick - show type for component elements -// Object obj = iter.next(); -// boolean added = false; -// if (obj instanceof IPersistentFieldMapping) { -// IPersistentFieldMapping fm = (IPersistentFieldMapping) obj; -// if (fm.getPersistentField() != null) -// { -// added = true; -// list.add(fm.getPersistentField()); -// } -// } -// if (!added) -// list.add(obj); -// //by Nick -// } -// return list.toArray(nullChildren); -// }*/ -// //return nullChildren; -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitIdBagMapping(org.jboss.tools.hibernate.core.hibernate.IIdBagMapping, java.lang.Object) -// */ -// public Object visitIdBagMapping(IIdBagMapping mapping, Object argument) { -// IHibernateValueMapping elem=mapping.getElement(); -// IHibernateValueMapping key=mapping.getKey(); -// IHibernateValueMapping id=mapping.getIdentifier(); -// return new Object[]{key,elem, id}; -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitJoinedSubclassMapping(org.jboss.tools.hibernate.core.hibernate.IJoinedSubclassMapping, java.lang.Object) -// */ -// public Object visitJoinedSubclassMapping(IJoinedSubclassMapping mapping, Object argument) { -// return visitPersistentClassMapping(mapping, argument); -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitJoinMapping(org.jboss.tools.hibernate.core.hibernate.IJoinMapping, java.lang.Object) -// */ -// public Object visitJoinMapping(IJoinMapping mapping, Object argument) { -// return null; -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitListMapping(org.jboss.tools.hibernate.core.hibernate.IListMapping, java.lang.Object) -// */ -// public Object visitListMapping(IListMapping mapping, Object argument) { -// return visitIndexedCollectionMapping(mapping, argument); -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitManyToAnyMapping(org.jboss.tools.hibernate.core.hibernate.IManyToAnyMapping, java.lang.Object) -// */ -// public Object visitManyToAnyMapping(IManyToAnyMapping mapping, Object argument) { -// return visitPersistentValueMapping(mapping, argument); -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitManyToManyMapping(org.jboss.tools.hibernate.core.hibernate.IManyToManyMapping, java.lang.Object) -// */ -// public Object visitManyToManyMapping(IManyToManyMapping mapping, Object argument) { -// return visitPersistentValueMapping(mapping, argument); -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitManyToOneMapping(org.jboss.tools.hibernate.core.hibernate.IManyToOneMapping, java.lang.Object) -// */ -// public Object visitManyToOneMapping(IManyToOneMapping mapping, Object argument) { -// return visitPersistentValueMapping(mapping, argument); -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitMapMapping(org.jboss.tools.hibernate.core.hibernate.IMapMapping, java.lang.Object) -// */ -// public Object visitMapMapping(IMapMapping mapping, Object argument) { -// return visitIndexedCollectionMapping(mapping, argument); -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitOneToManyMapping(org.jboss.tools.hibernate.core.hibernate.IOneToManyMapping, java.lang.Object) -// */ -// public Object visitOneToManyMapping(IOneToManyMapping mapping, Object argument) { -// return visitPersistentValueMapping(mapping, argument); -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitOneToOneMapping(org.jboss.tools.hibernate.core.hibernate.IOneToOneMapping, java.lang.Object) -// */ -// public Object visitOneToOneMapping(IOneToOneMapping mapping, Object argument) { -// return visitPersistentValueMapping(mapping, argument); -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitPrimitiveArrayMapping(org.jboss.tools.hibernate.core.hibernate.IPrimitiveArrayMapping, java.lang.Object) -// */ -// public Object visitPrimitiveArrayMapping(IPrimitiveArrayMapping mapping, Object argument) { -// return visitIndexedCollectionMapping(mapping, argument); -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitPropertyMapping(org.jboss.tools.hibernate.core.hibernate.IPropertyMapping, java.lang.Object) -// */ -// public Object visitPropertyMapping(IPropertyMapping mapping, Object argument) { -// return visitPersistentFieldMapping(mapping, argument); -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitRootClassMapping(org.jboss.tools.hibernate.core.hibernate.IRootClassMapping, java.lang.Object) -// */ -// public Object visitRootClassMapping(IRootClassMapping mapping, Object argument) { -// return visitPersistentClassMapping(mapping, argument); -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitSetMapping(org.jboss.tools.hibernate.core.hibernate.ISetMapping, java.lang.Object) -// */ -// public Object visitSetMapping(ISetMapping mapping, Object argument) { -// return visitCollectionMapping(mapping, argument); -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitSimpleValueMapping(org.jboss.tools.hibernate.core.hibernate.ISimpleValueMapping, java.lang.Object) -// */ -// public Object visitSimpleValueMapping(ISimpleValueMapping simple, Object argument) { -// return visitPersistentValueMapping(simple, argument); -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitSubclassMapping(org.jboss.tools.hibernate.core.hibernate.ISubclassMapping, java.lang.Object) -// */ -// public Object visitSubclassMapping(ISubclassMapping mapping, Object argument) { -// return visitPersistentClassMapping(mapping, argument); -// } -// -// /* (non-Javadoc) -// * @see org.jboss.tools.hibernate.core.hibernate.IHibernateMappingVisitor#visitUnionSubclassMapping(org.jboss.tools.hibernate.core.hibernate.IUnionSubclassMapping, java.lang.Object) -// */ -// public Object visitUnionSubclassMapping(IUnionSubclassMapping mapping, Object argument) { -// return visitPersistentClassMapping(mapping, argument); -// } -// -// // add tau 27.07.2005 -// public Object visitNamedQueryMapping(INamedQueryMapping mapping, Object argument) { -// return null; -// } - public Object visitDatabaseColumn(Column column, Object argument) { - // TODO Auto-generated method stub return null; } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/ObjectEditorInput.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/ObjectEditorInput.java 2007-07-05 12:01:50 UTC (rev 2313) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/ObjectEditorInput.java 2007-07-05 12:10:59 UTC (rev 2314) @@ -1,14 +1,14 @@ /******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Copyright (c) 2007 Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the * Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate.view.views; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.view.views; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.ui.IEditorInput; @@ -16,10 +16,6 @@ import org.hibernate.cfg.Configuration; -/** - * @author Konstantin Mishin - * - */ public class ObjectEditorInput implements IEditorInput{ protected Object fObject; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OpenDiagramActionDelegate.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OpenDiagramActionDelegate.java 2007-07-05 12:01:50 UTC (rev 2313) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OpenDiagramActionDelegate.java 2007-07-05 12:10:59 UTC (rev 2314) @@ -1,14 +1,14 @@ /******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Copyright (c) 2007 Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the * Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate.view.views; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.view.views; import java.util.HashMap; @@ -21,7 +21,7 @@ import org.eclipse.ui.ide.IDE; import org.eclipse.ui.internal.ObjectPluginAction; import org.hibernate.cfg.Configuration; -import org.jboss.tools.hibernate.view.ViewPlugin; +import org.jboss.tools.hibernate.ui.view.ViewPlugin; public class OpenDiagramActionDelegate implements IObjectActionDelegate { @@ -31,7 +31,6 @@ public void run(IAction action) { HashMap hashMap = new HashMap(); ObjectPluginAction objectPluginAction = (ObjectPluginAction)action; -// TreeSelection treeSelection = (TreeSelection)objectPluginAction.getSelection(); Object rootClass = ((TreeSelection)objectPluginAction.getSelection()).getFirstElement(); ObjectEditorInput input = (ObjectEditorInput)hashMap.get(rootClass); Configuration configuration = (Configuration)(((TreeSelection)objectPluginAction.getSelection()).getPaths()[0]).getSegment(1); @@ -40,16 +39,13 @@ hashMap.put(rootClass, input); } try { -// IDE.openEditor(ViewPlugin.getPage(),input ,"org.hibernate.eclipse.orm.veditor.editors.VizualEditor"); - IDE.openEditor(ViewPlugin.getPage(),input ,"org.jboss.tools.hibernate.veditor.editors.vizualeditor"); + IDE.openEditor(ViewPlugin.getPage(),input ,"org.jboss.tools.hibernate.ui.veditor.editors.visualeditor"); } catch (PartInitException e) { // ExceptionHandler.logThrowableError(e,"OpenEditor"); } } public void selectionChanged(IAction action, ISelection selection) { - // TODO Auto-generated method stub - } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OrmContentProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OrmContentProvider.java 2007-07-05 12:01:50 UTC (rev 2313) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OrmContentProvider.java 2007-07-05 12:10:59 UTC (rev 2314) @@ -1,14 +1,14 @@ /******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Copyright (c) 2007 Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the * Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate.view.views; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.view.views; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IProjectDescription; @@ -22,23 +22,16 @@ import org.eclipse.swt.widgets.TreeItem; -/** - * @author Tau from Minsk - */ public class OrmContentProvider implements ITreeContentProvider/*, IOrmModelListener, IOrmProjectChangedListener*/ { - //ExplorerClass protected static final int PACKAGE_CLASS_FIELD_CONTENT_PROVIDER = 1; protected static final int CLASS_FIELD_CONTENT_PROVIDER = 2; protected static final int STORAGE_CLASS_FIELD_CONTENT_PROVIDER = 3; - //ExplorerBase protected static final int SCHEMA_TABLE_COLUMN_CONTENT_PROVIDER = 4; protected static final int TABLE_COLUMN_CONTENT_PROVIDER = 5; protected TreeViewer viewer; -// protected IOrmProject ormProject; -// protected IOrmModel ormModel; private static final ContentProviderVisitor contentProviderVisitor = new ContentProviderVisitor(); private static final Object[] nullChildren = new Object[0]; @@ -46,15 +39,12 @@ private int tip; private boolean sorting; - // add 27.06.2005 private Object[] expandedElements = null; private ISelection selectionElements = null; - // add 09.11.2005 private String[] beforeChangeElements = null; private String beforeChangeSelectionElementQualifiedName = null; - // add tau 05.12.2005 public boolean lockMenu = false; @@ -63,20 +53,7 @@ sorting = true; // default - sort } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object) - */ - // edit tau 07.03.2006 public Object[] getChildren(Object parentElement) { -// if (parentElement instanceof IOrmModel) { -// children = ((IOrmModel) parentElement).getOrmProjects(); -// } else if (parentElement instanceof IOrmElement) { -// children = (Object[]) ((IOrmElement) parentElement).accept(contentProviderVisitor, viewer.getContentProvider()); -// } else children = nullChildren; - - // add Tau 05.05.2005 if (children == null) children = nullChildren; @@ -88,48 +65,6 @@ return children; } -// static protected Comparator<Object> comparator = new Comparator<Object>() { -// private Collator fCollator = Collator.getInstance(); -// -// public int compare(Object o1, Object o2) { -// -// String name1 = null; -// String name2 = null; -// if (o1 instanceof IOrmElement ) -// name1 = ((IOrmElement) o1).getName(); -// -// if (o2 instanceof IOrmElement ) -// name2 = ((IOrmElement) o2).getName(); -// -// /* del tau 29.09.2005 -// //akuzmin 21.08.2005 -// if ((name1==null)&&(name2==null)) -// { -// ExceptionHandler.logInfo("Error when compare element "+o1.toString()+" and "+o2.toString()); -// name1=""; -// name2=""; -// } -// else -// if (name1==null) -// { -// ExceptionHandler.logInfo("Error when compare element null and "+name2); -// name1=""; -// } -// else if (name2==null) -// { -// ExceptionHandler.logInfo("Error when compare element "+name1+" and null"); -// name2=""; -// } -// */ -// return fCollator.compare(name1, name2); -// } -// }; - - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object) - */ public Object getParent(Object element) { //if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("!!! OrmContentProvider.getParent(Object element):" + element + ", tip="+tip); @@ -137,11 +72,6 @@ return null; } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object) - */ public boolean hasChildren(Object element) { //TODO EXP 3d //return getChildren(element).length > 0; @@ -154,30 +84,14 @@ return true; } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object) - */ public Object[] getElements(Object inputElement) { return getChildren(inputElement); } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.viewers.IContentProvider#dispose() - */ public void dispose() { } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, - * java.lang.Object, java.lang.Object) - */ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) { // if (ViewPlugin.TRACE || ViewPlugin.TRACE_VIEW ) ExceptionHandler.logInfo("OrmContentProvider.inputChanged():"+", tip="+tip+", this= " + this); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OrmLabelProvider.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OrmLabelProvider.java 2007-07-05 12:01:50 UTC (rev 2313) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OrmLabelProvider.java 2007-07-05 12:10:59 UTC (rev 2314) @@ -1,14 +1,14 @@ /******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Copyright (c) 2007 Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the * Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate.view.views; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.view.views; import java.util.HashMap; import java.util.Iterator; @@ -35,36 +35,22 @@ import org.hibernate.mapping.SingleTableSubclass; import org.hibernate.mapping.Table; -/** - * @author Tau from Minsk - * - */ public class OrmLabelProvider extends LabelProvider implements IColorProvider, IFontProvider { private Map imageCache = new HashMap(25); private OrmModelImageVisitor ormModelImageVisitor; private OrmModelNameVisitor ormModelNameVisitor; - /** - * @param ormModelImageVisitor - */ public OrmLabelProvider(OrmModelImageVisitor imageVisitor, OrmModelNameVisitor nameVisitor) { super(); ormModelImageVisitor = imageVisitor; ormModelNameVisitor = nameVisitor; } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object) - */ public Image getImage(Object element) { ImageDescriptor descriptor = null; -/// if (element instanceof IOrmElement) { if (element instanceof RootClass) { -/// descriptor = (ImageDescriptor) ((IOrmElement) element).accept(ormModelImageVisitor, null); descriptor = (ImageDescriptor) ((RootClass) element).accept(ormModelImageVisitor); } else if (element instanceof Property) { descriptor = (ImageDescriptor)ormModelImageVisitor.visitPersistentField((Property) element, null); @@ -77,12 +63,10 @@ } else if (element instanceof Component) { descriptor = (ImageDescriptor)ormModelImageVisitor.visitComponentMapping((Component) element); } else { - // edit tau 07.03.2006 //throw unknownElement(element); return null; } - // obtain the cached image corresponding to the descriptor Image image = (Image) imageCache.get(descriptor); if (image == null) { image = descriptor.createImage(); @@ -91,13 +75,7 @@ return image; } - /* - * (non-Javadoc) - * - * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object) - */ public String getText(Object element) { -/// if (element instanceof IOrmElement) { if (element instanceof RootClass) { String name = (String)ormModelNameVisitor.visitPersistentClass((RootClass)element, null); if (name == null) { @@ -127,7 +105,6 @@ return name; } } else if (element instanceof OneToMany || element instanceof ManyToOne) { -// String name = (String)ormModelNameVisitor.visitComponentMapping((Component)element, null); String name = "element"; if (name == null) { return "OrmElement"; @@ -162,7 +139,6 @@ } protected RuntimeException unknownElement(Object element) { - // TODO (tau->tau) go to Eclipse Exception if (element != null && element.getClass() != null ) return new RuntimeException("Unknown type of element in tree of type: " + element.getClass().getName()); else return new RuntimeException("Unknown type of element in tree of type: " + element); @@ -176,9 +152,6 @@ imageCache.clear(); } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IColorProvider#getForeground(java.lang.Object) - */ public Color getForeground(Object element) { if (element instanceof RootClass) { return Display.getCurrent().getSystemColor(SWT.COLOR_DARK_GREEN); @@ -189,16 +162,10 @@ return null; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IColorProvider#getBackground(java.lang.Object) - */ public Color getBackground(Object element) { return null; } - /* (non-Javadoc) - * @see org.eclipse.jface.viewers.IFontProvider#getFont(java.lang.Object) - */ public Font getFont(Object element) { /* if (element instanceof IOrmProject) { return JFaceResources.getFontRegistry().getBold(JFaceResources.getTextFont().getFontData()[0].getName()); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OrmModelImageVisitor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OrmModelImageVisitor.java 2007-07-05 12:01:50 UTC (rev 2313) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OrmModelImageVisitor.java 2007-07-05 12:10:59 UTC (rev 2314) @@ -1,14 +1,14 @@ /******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Copyright (c) 2007 Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the * Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate.view.views; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.view.views; import java.util.ResourceBundle; @@ -23,7 +23,7 @@ import org.hibernate.mapping.Subclass; import org.hibernate.mapping.Table; import org.hibernate.mapping.UnionSubclass; -import org.jboss.tools.hibernate.view.ViewPlugin; +import org.jboss.tools.hibernate.ui.view.ViewPlugin; @@ -39,146 +39,17 @@ private static Integer VER = new Integer(2); - /* (non-Javadoc) - * @see org.jboss.tools.hibernate.core.IOrmModelVisitor#visitOrmModel(org.jboss.tools.hibernate.core.IOrmProject, java.lang.Object) - */ -// public Object visitOrmProject(IOrmProject schema, Object argument) { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.OrmModel")); //$NON-NLS-1$ -// } - - /* (non-Javadoc) - * @see org.jboss.tools.hibernate.core.IOrmModelVisitor#visitDatabaseSchema(org.jboss.tools.hibernate.core.IDatabaseSchema, java.lang.Object) - */ -// public Object visitDatabaseSchema(IDatabaseSchema schema, Object argument) { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseSchema")); //$NON-NLS-1$ -// } - - /* (non-Javadoc) - * @see org.jboss.tools.hibernate.core.IOrmModelVisitor#visitDatabaseTable(org.jboss.tools.hibernate.core.IDatabaseTable, java.lang.Object) - */ -// public Object visitDatabaseTable(IDatabaseTable table, Object argument) { -// if ((table != null) && table.isView() ){ -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseView")); //$NON-NLS-1$ -// } -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseTable")); //$NON-NLS-1$ -// } - public Object visitDatabaseTable(Table table) { -// if ((table != null) && table.isView() ){ -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseView")); //$NON-NLS-1$ -// } return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseTable")); //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.jboss.tools.hibernate.core.IOrmModelVisitor#visitDatabaseColumn(org.jboss.tools.hibernate.core.IDatabaseColumn, java.lang.Object) - */ -// public Object visitDatabaseColumn(IDatabaseColumn column, Object argument) { -// // #added# by Konstantin Mishin on 24.12.2005 fixed for ESORM-256 -// if(column.isUnique()) -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseUniqueKeyColumn")); -// // #added# -// else if (column.isPrimaryKey()&& column.getOwnerTable() != null && column.getOwnerTable().isForeignKey(column.getName())){ -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabasePrimaryForeignKeysColumn")); -// } else if (column.isPrimaryKey()){ -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabasePrimaryKeyColumn")); //$NON-NLS-1$ -// } else if (column.getOwnerTable() != null && column.getOwnerTable().isForeignKey(column.getName())){ -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseForeignKeyColumn")); //$NON-NLS-1$ -// } else return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseColumn")); //$NON-NLS-1$ -// -// } - public Object visitDatabaseColumn(Column column) { - // #added# by Konstantin Mishin on 24.12.2005 fixed for ESORM-256 if(column.isUnique()) { return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseUniqueKeyColumn")); - // #added# -// } else if (column.isPrimaryKey()&& column.getOwnerTable() != null && column.getOwnerTable().isForeignKey(column.getName())){ -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabasePrimaryForeignKeysColumn")); -// } else if (column.isPrimaryKey()){ -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabasePrimaryKeyColumn")); //$NON-NLS-1$ -// } else if (column.getOwnerTable() != null && column.getOwnerTable().isForeignKey(column.getName())){ -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseForeignKeyColumn")); //$NON-NLS-1$ } else return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseColumn")); //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.jboss.tools.hibernate.core.IOrmModelVisitor#visitDatabaseConstraint(org.jboss.tools.hibernate.core.IDatabaseConstraint, java.lang.Object) - */ -// public Object visitDatabaseConstraint(IDatabaseConstraint constraint, Object argument) { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.DatabaseConstraint")); //$NON-NLS-1$ -// } - - /* (non-Javadoc) - * @see org.jboss.tools.hibernate.core.IOrmModelVisitor#visitPackage(org.jboss.tools.hibernate.core.IPackage, java.lang.Object) - */ -// public Object visitPackage(IPackage pakage, Object argument) { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Package")); //$NON-NLS-1$ -// } - - /* (non-Javadoc) - * @see org.jboss.tools.hibernate.core.IOrmModelVisitor#visitMapping(org.jboss.tools.hibernate.core.IMapping, java.lang.Object) - */ -// public Object visitMapping(IMapping mapping, Object argument) { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Mapping")); //$NON-NLS-1$ -// } - - /* (non-Javadoc) - * @see org.jboss.tools.hibernate.core.IOrmModelVisitor#visitMappingStorage(org.jboss.tools.hibernate.core.IMappingStorage, java.lang.Object) - */ -// public Object visitMappingStorage(IMappingStorage storage, Object argument) { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.MappingStorage")); //$NON-NLS-1$ -// } - - /* (non-Javadoc) - * @see org.jboss.tools.hibernate.core.IOrmModelVisitor#visitPersistentClass(org.jboss.tools.hibernate.core.IPersistentClass, java.lang.Object) - */ -// public Object visitPersistentClass(IPersistentClass clazz, Object argument) { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentClass")); //$NON-NLS-1$ -// } - - /* (non-Javadoc) - * @see org.jboss.tools.hibernate.core.IOrmModelVisitor#visitPersistentField(org.jboss.tools.hibernate.core.IPersistentField, java.lang.Object) - */ -// public Object visitPersistentField(IPersistentField field, Object argument) { -// -// //((IHibernateClassMapping)field.getOwnerClass().getPersistentClassMapping()).getIdentifierProperty(); -// //==propertyMapping -// -// //add tau 08.04.2005 -// -// if (field !=null){ -// IPersistentFieldMapping mapping = field.getMapping(); -// if (mapping != null){ -// IPersistentValueMapping valueMapping = mapping.getPersistentValueMapping(); -// if (valueMapping != null){ -// IPersistentClass pClass = field.getOwnerClass(); -// if (pClass != null){ -// IPersistentClassMapping classMapping = pClass.getPersistentClassMapping(); -// if (classMapping != null){ -// if (mapping == ((IHibernateClassMapping)classMapping).getIdentifierProperty()){ -// argument = ID; -// } else if (mapping == ((IHibernateClassMapping)classMapping).getVersion()){ -// argument = VER; -// } -// } -// } -// //akuzmin 14.09.2005 show parent image -// if ((((PropertyMapping)field.getMapping()).getPropertyMappingHolder() instanceof ComponentMapping) -// &&(field.getName().equals(((ComponentMapping)((PropertyMapping)field.getMapping()).getPropertyMappingHolder()).getParentProperty()))) -// { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldParent"));//parent image -// } -// else -// return valueMapping.accept(this, argument); -// } -// } -// } -// -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); //$NON-NLS-1$ -// } - public Object visitPersistentField(Property field, Object argument) { if (field !=null){ if (field.getType().isCollectionType()) { @@ -188,68 +59,6 @@ return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); //$NON-NLS-1$ } - /* (non-Javadoc) - * @see org.jboss.tools.hibernate.core.IOrmModelVisitor#visitPersistentClassMapping(org.jboss.tools.hibernate.core.IPersistentClassMapping, java.lang.Object) - */ -// public Object visitPersistentClassMapping(IPersistentClassMapping mapping, Object argument) { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentClassMapping")); //$NON-NLS-1$ -// } - - /* (non-Javadoc) - * @see org.jboss.tools.hibernate.core.IOrmModelVisitor#visitPersistentFieldMapping(org.jboss.tools.hibernate.core.IPersistentFieldMapping, java.lang.Object) - */ -// public Object visitPersistentFieldMapping(IPersistentFieldMapping mapping, Object argument) { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldMapping")); //$NON-NLS-1$ -// } - - /* (non-Javadoc) - * @see org.jboss.tools.hibernate.core.IOrmModelVisitor#visitPersistentValueMapping(org.jboss.tools.hibernate.core.IPersistentValueMapping, java.lang.Object) - */ -// public Object visitPersistentValueMapping(IPersistentValueMapping mapping, Object argument) { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentValueMapping")); //$NON-NLS-1$ -// } - - // add tau 08.04.2005 for PersistentField icons -// public Object visitSimpleValueMapping(ISimpleValueMapping simple, Object argument) { -// if (argument == ID){ -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldSimple_id")); //$NON-NLS-1$ -// } else if (argument == VER){ -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldSimple_version")); //$NON-NLS-1$ -// } else { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldSimple")); //$NON-NLS-1$ -// } -// -// } - -// public Object visitAnyMapping(IAnyMapping mapping, Object argument) { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldAny")); //$NON-NLS-1$ -// } - -// public Object visitListMapping(IListMapping column, Object argument) { -// if (column !=null){ -// // edit tau 13.05.2005 -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_list")); //$NON-NLS-1$ -// } -// -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); //$NON-NLS-1$ -// } - -// public Object visitArrayMapping(IArrayMapping kage, Object argument) { -// if (kage !=null){ -// // edit tau 13.05.2005 -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_array")); //$NON-NLS-1$ -// } -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); //$NON-NLS-1$ -// } - -// public Object visitComponentMapping(IComponentMapping mapping, Object argument) { -// if (argument == ID){ -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldComponent_id")); //$NON-NLS-1$ -// } else { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldComponent")); //$NON-NLS-1$ -// } -// } - public Object visitComponentMapping(Component mapping) { if (mapping != null){ return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldComponent")); //$NON-NLS-1$ @@ -264,110 +73,7 @@ return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); //$NON-NLS-1$ } -// public Object visitBagMapping(IBagMapping bagMapping, Object argument) { -// if (bagMapping !=null){ -// // edit tau 13.05.2005 -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_bag")); //$NON-NLS-1$ -// } -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); //$NON-NLS-1$ -// } - -// public Object visitIdBagMapping(IIdBagMapping table, Object argument) { -// if (table !=null){ -// // edit tau 13.05.2005 -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_idbag")); //$NON-NLS-1$ -// } -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); //$NON-NLS-1$ -// } - -// public Object visitPrimitiveArrayMapping(IPrimitiveArrayMapping constraint, Object argument) { -// if (constraint !=null){ -// // edit tau 13.05.2005 -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_primitive_array")); //$NON-NLS-1$ -// } -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); //$NON-NLS-1$ -// } - -// public Object visitMapMapping(IMapMapping mapping, Object argument) { -// if (mapping !=null){ -// // edit tau 13.05.2005 -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_map")); //$NON-NLS-1$ -// } -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); //$NON-NLS-1$ -// } - -// public Object visitSetMapping(ISetMapping mapping, Object argument) { -// if (mapping !=null){ -// // edit tau 13.05.2005 -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.Collection_set")); //$NON-NLS-1$ -// } -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); //$NON-NLS-1$ -// } - -// public Object visitOneToManyMapping(IOneToManyMapping mapping, Object argument) { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldOne-to-many")); //$NON-NLS-1$ -// } - -// public Object visitManyToManyMapping(IManyToManyMapping mapping, Object argument) { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldMany-to-many")); //$NON-NLS-1$ -// } - -// public Object visitManyToAnyMapping(IManyToAnyMapping mapping, Object argument) { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldMany-to-any")); //$NON-NLS-1$ -// } - -// public Object visitManyToOneMapping(IManyToOneMapping mapping, Object argument) { -// if (argument == ID){ -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldMany-to-one_id")); //$NON-NLS-1$ -// } else { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldMany-to-one")); //$NON-NLS-1$ -// } -// } - -// public Object visitOneToOneMapping(IOneToOneMapping mapping, Object argument) { -// if (argument == ID){ -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldOne-to-one_id")); //$NON-NLS-1$ -// } else { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldOne-to-one")); //$NON-NLS-1$ -// } -// } - -// public Object visitJoinMapping(IJoinMapping mapping, Object argument) { -// // ?? -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentJoinedSubclassMapping")); //$NON-NLS-1$ -// } - -// public Object visitRootClassMapping(IRootClassMapping mapping, Object argument) { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentRootClassMapping")); //$NON-NLS-1$ -// } - -// public Object visitSubclassMapping(ISubclassMapping mapping, Object argument) { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentSubclassMapping")); //$NON-NLS-1$ -// } - -// public Object visitJoinedSubclassMapping(IJoinedSubclassMapping mapping, Object argument) { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentJoinedSubclassMapping")); //$NON-NLS-1$ -// } - -// public Object visitUnionSubclassMapping(IUnionSubclassMapping mapping, Object argument) { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentUnionSubclassMapping")); //$NON-NLS-1$ -// } - -// public Object visitPropertyMapping(IPropertyMapping mapping, Object argument) { -// if (mapping != null){ -// IHibernateValueMapping valueMapping = mapping.getValue(); -// if (valueMapping != null) return valueMapping.accept(this, argument); -// } -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.PersistentFieldNot_mapped")); //$NON-NLS-1$ -// } - - // add tau 27.07.2005 -// public Object visitNamedQueryMapping(INamedQueryMapping mapping, Object argument) { -// return ViewPlugin.getImageDescriptor(BUNDLE.getString("OrmModelImageVisitor.NamedQueryMapping")); //$NON-NLS-1$ -// } - public Object visitDatabaseColumn(Column column, Object argument) { - // TODO Auto-generated method stub return null; } @@ -376,22 +82,18 @@ } public Object accept(UnionSubclass arg0) { - // TODO Auto-generated method stub return null; } public Object accept(SingleTableSubclass arg0) { - // TODO Auto-generated method stub return null; } public Object accept(JoinedSubclass arg0) { - // TODO Auto-generated method stub return null; } public Object accept(Subclass arg0) { - // TODO Auto-generated method stub return null; } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OrmModelNameVisitor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OrmModelNameVisitor.java 2007-07-05 12:01:50 UTC (rev 2313) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/OrmModelNameVisitor.java 2007-07-05 12:10:59 UTC (rev 2314) @@ -1,14 +1,14 @@ /******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Copyright (c) 2007 Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the * Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate.view.views; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.view.views; import java.sql.Types; import java.util.ResourceBundle; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/ViewsAction.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/ViewsAction.java 2007-07-05 12:01:50 UTC (rev 2313) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.view/src/org/jboss/tools/hibernate/view/views/ViewsAction.java 2007-07-05 12:10:59 UTC (rev 2314) @@ -1,118 +1,29 @@ /******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and Red Hat, Inc. + * Copyright (c) 2007 Red Hat, Inc. * Distributed under license by Red Hat, Inc. All rights reserved. * This program is made available under the terms of the * Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html * - * Contributors: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.hibernate.view.views; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.view.views; import java.util.HashMap; import java.util.ResourceBundle; import org.eclipse.ui.PartInitException; import org.eclipse.ui.ide.IDE; -import org.jboss.tools.hibernate.view.ViewPlugin; +import org.jboss.tools.hibernate.ui.view.ViewPlugin; public class ViewsAction { - - //TODO (tau-tau) for Exception ALL - -// static ActionOrmTree hibernateConnectionWizardAction; -// static ActionOrmTree hibernateAddMappingWizardAction; -// static ActionOrmTree persistentClassesWizardAction; -// static ActionOrmTree fieldMappingWizardAction; - //akuzmin 06.10.2005 -// static ActionOrmTree fieldMappingWizardNewAction; -// -// static ActionOrmTree tablesClassesWizardAction; -// static ActionOrmTree mappingWizardAction; -// static ActionOrmTree cacheWizardAction; -// -// static ActionOrmTree clearPackageMappingAction; -// static ActionOrmTree clearClassMappingAction; -// static ActionOrmTree clearFieldMappingAction; -// -// static ActionOrmTree removeClassAction; -// -// static ActionOrmTree classAutoMappingAction; -// static ActionOrmTree packageAutoMappingAction; -// -// static ActionOrmTree autoMappingSettingAction; -// static ActionOrmTree runTimeSettingAction; - - // add 22.04.2005 -// static ActionOrmTree generateDDLWizard; - - // add 23.05.2005 -// static ActionOrmTree refactoringDialogClassAction; -// static ActionOrmTree refactoringDialogFieldAction; -// static ActionOrmTree fetchStrategyWizardAction; -// static ActionOrmTree collapseAllAction; -// static ActionOrmTree expandAllAction; - - // add 24.05.2005 -// static ActionOrmTree refreshMappingAction; -// static ActionOrmTree renameTableObjectAction; -// static ActionOrmTree addColumnDialogAction; -// static ActionOrmTree removeTableAction; - - // add 26.05.2005 -// static ActionOrmTree renameTableObjectDialogForColumnAction; - - // add 31.05.2005 -// static ActionOrmTree addMappingStorageAction; - - // add 03.06.2005 -// static ActionOrmTree columnPropertyDialogAction; -// static ActionOrmTree viewTableAction; - - // add 16.06.2005 -// static ActionOrmTree refreshOrmProjectAction; - - // 20050618 <yan> -// static ActionOrmTree removeClassesAction; - -// static ActionOrmTree removeConfigAction; - //</yan> - - // 20050620 <yan> -// static ActionOrmTree openSourceAction; -// static ActionOrmTree openMappingStorageAction; -// static ActionOrmTree openMappingAction; - // </yan> - - // 20050727 <yan> -// static ActionOrmTree editNamedQueryAction,addNamedQueryAction,removeNamedQueryAction,testQueryAction; - // </yan> - - // add tau 12.07.2005 -// static ActionOrmTree refreshSchemaMappingAction; - - // add tau 20.07.2005 -// static ActionOrmTree refreshClassSchemaMappingAction; -// static ActionOrmTree refreshPackageSchemaMappingAction; -// static ActionOrmTree refreshMappingSchemaMappingAction; - - // add tau 26.07.2005 -// static ActionOrmTree refreshDatabaseTableSchemaMappingAction; - //akuzmin 16.08.2005 -// static ActionOrmTree GenerateDAOWizardAction; - // #added# by Konstantin Mishin on 25.03.2006 fixed for ESORM-28 static ActionOrmTree openEditorAction; - // #added# - // add 09.03.2005 static private ResourceBundle BUNDLE_IMAGE = ViewPlugin.BUNDLE_IMAGE; static private ResourceBundle BUNDLE = ResourceBundle.getBundle(ViewsAction.class.getPackage().getName() + ".views"); - // added by yk 12.09.2005. -// static ActionOrmTree showHibernateConsole; - static { openEditorAction = new ActionOrmTree() { HashMap<Object,ObjectEditorInput> hashMap = new HashMap<Object,ObjectEditorInput>(); @@ -123,7 +34,7 @@ hashMap.put(this.getViewer().getTree().getSelection()[0].getData(), input); } try { - IDE.openEditor(ViewPlugin.getPage(),input ,"org.jboss.tools.hibernate.veditor.editors.vizualeditor"); + IDE.openEditor(ViewPlugin.getPage(),input ,"org.jboss.tools.hibernate.ui.veditor.editors.visualeditor"); } catch (PartInitException e) { // ExceptionHandler.logThrowableError(e,"OpenEditor"); } @@ -131,89 +42,5 @@ }; openEditorAction.setText(BUNDLE.getString("Explorer.OpenEditorActionName")); openEditorAction.setToolTipText(BUNDLE.getString("Explorer.OpenEditorActionToolTipText")); - // #added# } - - /** - * @return IOrmProject - */ -// static private IOrmProject getOrmProject(Tree tree) { -// TreeItem[] items = tree.getSelection(); -// -// // 20050623 <yan> -// if (items.length==0) return null; -// // </yan> -// -// TreeItem parentItem = items[0]; -// TreeItem ormItem; -// do { -// ormItem = parentItem; -// parentItem = parentItem.getParentItem(); -// } while (parentItem != null); -// return (IOrmProject)ormItem.getData(); -// } - - // #added# by Konstantin Mishin on 11.09.2005 fixed for ORMIISTUD-660 -// static private void traverse(IContainer container, HashSet<Object> hs, HBMViewerFilter vf) { -// try { -// IResource[] resources = container.members(); -// for (int i = 0; i < resources.length; i++) { -// IResource resource = resources[i]; -// if (resource instanceof IFile) { -// String ext = resource.getName(); -// if ((ext != null && (ext.toLowerCase().endsWith(".hbm") || ext.toLowerCase().endsWith(".hbm.xml"))) && vf.isSelectedMappingStorage(resource) && vf.isSrc(resource.getFullPath().toString())) { -// hs.add(resource); -// } -// } else if (resource.isAccessible() && resource instanceof IContainer) { -// traverse((IContainer)resource, hs, vf); -// } -// } -// } catch (CoreException e) { -// ExceptionHandler.logThrowableError(e, null); -// } -// } - // #added# - - // yan 2005.09.22 -// static private void removePersistentClass(IPersistentClass pc, boolean delSource, boolean delMapping, HashSet<IMapping> refrMaps) throws CoreException { -// if (!delMapping) { -// pc.getProjectMapping().removePersistentClass(pc.getName(),false); -// refrMaps.add(pc.getProjectMapping()); -// } else { -// IMapping[] maps = ClassUtils.getReferencedMappings(pc); -// for(int i=0; i<maps.length; i++) { -// -// maps[i].removePersistentClass(pc.getName(),true); -// refrMaps.add(maps[i]); -// -// } -// -// } -// } - // yan - // yan 2005.09.22 -// static private void clearPersistentClassMapping(IPersistentClass pc, HashSet<IMapping> refrMaps) throws CoreException { -// IMapping[] maps = ClassUtils.getReferencedMappings(pc); -// for(int i = 0; i < maps.length; i++) { -// IPersistentClass tpc = maps[i].findClass(pc.getName()); -// if (tpc!=null) { -// tpc.clearMapping(); -// refrMaps.add(maps[i]); -// } -// } -// } - -// static private void refreshMappings(HashSet refrMaps) { -// for(Iterator it=refrMaps.iterator(); it.hasNext();) { -// try { -// ((IMapping)it.next()).save(); -// } catch (IOException e) { -// ExceptionHandler.logThrowableError(e,"Save project's mapping."); -// } catch (CoreException e) { -// ExceptionHandler.logThrowableWarning(e,"Save project's mapping."); -// } -// } -// } - // yan - }