Author: mdryakhlenkov Date: 2007-07-05 07:05:24 -0400 (Thu, 05 Jul 2007) New Revision: 2298 Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/ui/ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/VisualEditorPlugin.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/VisualEditor.java Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/META-INF/MANIFEST.MF trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/EditorActionContributor.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/Messages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/AutoLayout.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/Example.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/IDiagramInfo.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/IItemInfo.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/ILinkInfo.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/AutoLayoutImpl.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/Group.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/GroupArranger.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/Groups.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/Item.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/Items.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/LayuotConstants.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/TransitionArranger.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/command/ShapeSetConstraintCommand.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/ComponentFigure.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/RoundLineBorder.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/RoundPolylineConnection.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/TitleFigure.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/TopLineBorder.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ComponentShape.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/Connection.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ExpandeableShape.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ModelElement.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmShape.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/Shape.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/SpecialOrmShape.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/SpecialRootClass.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ComponentShapeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ConnectionEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ExpandeableShapeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/Messages.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/OrmEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/OrmEditPartFactory.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/OrmShapeEditPart.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ResourceManager.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ShapeEditPart.java Log: JBIDE-559: Hibernate diagram editor cleanup Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/META-INF/MANIFEST.MF =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/META-INF/MANIFEST.MF 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/META-INF/MANIFEST.MF 2007-07-05 11:05:24 UTC (rev 2298) @@ -2,7 +2,7 @@ Eclipse-LazyStart: true Bundle-Name: %pluginName Bundle-ClassPath: orm2-veditor.jar -Bundle-Activator: org.jboss.tools.hibernate.veditor.VizualEditorPlugin +Bundle-Activator: org.jboss.tools.hibernate.ui.veditor.VisualEditorPlugin Bundle-Vendor: %providerName Bundle-ManifestVersion: 2 Bundle-Localization: plugin @@ -17,10 +17,10 @@ org.jboss.tools.hibernate.ui.view, org.jboss.tools.common Bundle-Version: 2.0.0 -Export-Package: org.jboss.tools.hibernate.veditor, - org.jboss.tools.hibernate.veditor.editors, - org.jboss.tools.hibernate.veditor.editors.command, - org.jboss.tools.hibernate.veditor.editors.figures, - org.jboss.tools.hibernate.veditor.editors.model, - org.jboss.tools.hibernate.veditor.editors.parts +Export-Package: org.jboss.tools.hibernate.ui.veditor, + org.jboss.tools.hibernate.ui.veditor.editors, + org.jboss.tools.hibernate.ui.veditor.editors.command, + org.jboss.tools.hibernate.ui.veditor.editors.figures, + org.jboss.tools.hibernate.ui.veditor.editors.model, + org.jboss.tools.hibernate.ui.veditor.editors.parts Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/VisualEditorPlugin.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/VisualEditorPlugin.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/VisualEditorPlugin.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -0,0 +1,51 @@ +/******************************************************************************* + * 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor; + +import org.eclipse.ui.plugin.*; +import org.eclipse.jface.resource.ImageDescriptor; +import org.osgi.framework.BundleContext; +import org.jboss.tools.common.log.BaseUIPlugin; +import org.jboss.tools.common.log.IPluginLog; + +public class VisualEditorPlugin extends BaseUIPlugin { + + public final static String PLUGIN_ID= "org.jboss.tools.hibernate.ui.veditor"; + + //The shared instance. + private static VisualEditorPlugin plugin; + + public VisualEditorPlugin() { + plugin = this; + } + + public void start(BundleContext context) throws Exception { + super.start(context); + } + + public void stop(BundleContext context) throws Exception { + super.stop(context); + plugin = null; + } + + public static VisualEditorPlugin getDefault() { + return plugin; + } + + public static ImageDescriptor getImageDescriptor(String path) { + return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path); + } + + public static IPluginLog getPluginLog() { + return getDefault(); + } + +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/EditorActionContributor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/EditorActionContributor.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/EditorActionContributor.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -1,23 +1,21 @@ /******************************************************************************* - * 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.veditor.editors; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors; import org.eclipse.gef.ui.actions.ActionBarContributor; import org.eclipse.jface.action.IToolBarManager; import org.eclipse.ui.actions.ActionFactory; import org.eclipse.ui.actions.ActionFactory.IWorkbenchAction; -import org.jboss.tools.hibernate.view.ViewPlugin; +import org.jboss.tools.hibernate.ui.view.ViewPlugin; - - public class EditorActionContributor extends ActionBarContributor { protected void buildActions() { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/Messages.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/Messages.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -1,25 +1,24 @@ /******************************************************************************* - * 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.veditor.editors; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors; import org.eclipse.osgi.util.NLS; public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.veditor.editors.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.ui.veditor.editors.messages"; private Messages() { } static { - // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); } Added: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/VisualEditor.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/VisualEditor.java (rev 0) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/VisualEditor.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -0,0 +1,101 @@ +/******************************************************************************* + * 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 + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors; + +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.gef.DefaultEditDomain; +import org.eclipse.gef.GraphicalViewer; +import org.eclipse.gef.dnd.TemplateTransferDropTargetListener; +import org.eclipse.gef.editparts.ScalableFreeformRootEditPart; +import org.eclipse.gef.requests.CreationFactory; +import org.eclipse.gef.requests.SimpleFactory; +import org.eclipse.gef.ui.actions.WorkbenchPartAction; +import org.eclipse.gef.ui.parts.GraphicalEditor; +import org.eclipse.jface.util.TransferDropTargetListener; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.actions.ActionFactory; +import org.hibernate.cfg.Configuration; +import org.hibernate.mapping.RootClass; +import org.jboss.tools.hibernate.ui.veditor.editors.model.OrmDiagram; +import org.jboss.tools.hibernate.ui.veditor.editors.parts.OrmEditPartFactory; +import org.jboss.tools.hibernate.ui.view.views.ObjectEditorInput; + +public class VisualEditor extends GraphicalEditor { + + private OrmDiagram ormDiagram = null; + + public VisualEditor() { + setEditDomain(new DefaultEditDomain(this)); + } + + public void doSave(IProgressMonitor monitor) { + ormDiagram.save(); + ormDiagram.setDirty(false); + } + + public void doSaveAs() { + } + + protected void initializeGraphicalViewer() { + final GraphicalViewer viewer = getGraphicalViewer(); + viewer.setEditPartFactory(new OrmEditPartFactory()); + viewer.setRootEditPart(new ScalableFreeformRootEditPart()); + viewer.addDropTargetListener(createTransferDropTargetListener()); + viewer.setContents(ormDiagram); + } + + protected void createActions() { + getEditorSite().getActionBars().setGlobalActionHandler(ActionFactory.REFRESH.getId(),new WorkbenchPartAction(this){ + + protected boolean calculateEnabled() { + return true; + } + public void run() { + ormDiagram.refresh(); + } + }); + super.createActions(); + } + + private TransferDropTargetListener createTransferDropTargetListener() { + return new TemplateTransferDropTargetListener(getGraphicalViewer()) { + protected CreationFactory getFactory(Object template) { + return new SimpleFactory((Class) template); + } + }; + } + + public boolean isSaveAsAllowed() { + return false; + } + + public boolean isSaveOnCloseNeeded() { + return true; + } + + public void refreshDirty() { + firePropertyChange(IEditorPart.PROP_DIRTY); + } + + public boolean isDirty() { + return ormDiagram.isDirty(); + } + + protected void setInput(IEditorInput input) { + super.setInput(input); + ObjectEditorInput objectEditorInput = (ObjectEditorInput)input; + Configuration configuration = objectEditorInput.getConfiguration(); + RootClass rootClass = (RootClass)(objectEditorInput).getObject(); + setPartName("Diagram for " + rootClass.getClassName()); + ormDiagram = new OrmDiagram(configuration, rootClass); + } +} Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/AutoLayout.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/AutoLayout.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/AutoLayout.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -8,10 +8,10 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.hibernate.veditor.editors.autolayout; +package org.jboss.tools.hibernate.ui.veditor.editors.autolayout; -import org.jboss.tools.hibernate.veditor.editors.autolayout.impl.AutoLayoutImpl; -import org.jboss.tools.hibernate.veditor.editors.autolayout.impl.Items; +import org.jboss.tools.hibernate.ui.veditor.editors.autolayout.impl.AutoLayoutImpl; +import org.jboss.tools.hibernate.ui.veditor.editors.autolayout.impl.Items; public class AutoLayout { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/Example.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/Example.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/Example.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.hibernate.veditor.editors.autolayout; +package org.jboss.tools.hibernate.ui.veditor.editors.autolayout; import java.util.ArrayList; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/IDiagramInfo.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/IDiagramInfo.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/IDiagramInfo.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.hibernate.veditor.editors.autolayout; +package org.jboss.tools.hibernate.ui.veditor.editors.autolayout; public interface IDiagramInfo { IItemInfo[] getItems(); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/IItemInfo.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/IItemInfo.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/IItemInfo.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.hibernate.veditor.editors.autolayout; +package org.jboss.tools.hibernate.ui.veditor.editors.autolayout; public interface IItemInfo { public String getID(); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/ILinkInfo.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/ILinkInfo.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/ILinkInfo.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.hibernate.veditor.editors.autolayout; +package org.jboss.tools.hibernate.ui.veditor.editors.autolayout; public interface ILinkInfo { public String getTargetID(); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/AutoLayoutImpl.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/AutoLayoutImpl.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/AutoLayoutImpl.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -8,11 +8,11 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.hibernate.veditor.editors.autolayout.impl; +package org.jboss.tools.hibernate.ui.veditor.editors.autolayout.impl; -import org.jboss.tools.hibernate.veditor.editors.autolayout.IItemInfo; -import org.jboss.tools.hibernate.veditor.editors.autolayout.ILinkInfo; -import org.jboss.tools.hibernate.veditor.editors.autolayout.IDiagramInfo; +import org.jboss.tools.hibernate.ui.veditor.editors.autolayout.IItemInfo; +import org.jboss.tools.hibernate.ui.veditor.editors.autolayout.ILinkInfo; +import org.jboss.tools.hibernate.ui.veditor.editors.autolayout.IDiagramInfo; public class AutoLayoutImpl { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/Group.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/Group.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/Group.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.hibernate.veditor.editors.autolayout.impl; +package org.jboss.tools.hibernate.ui.veditor.editors.autolayout.impl; import java.util.*; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/GroupArranger.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/GroupArranger.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/GroupArranger.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.hibernate.veditor.editors.autolayout.impl; +package org.jboss.tools.hibernate.ui.veditor.editors.autolayout.impl; public class GroupArranger { Group group; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/Groups.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/Groups.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/Groups.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.hibernate.veditor.editors.autolayout.impl; +package org.jboss.tools.hibernate.ui.veditor.editors.autolayout.impl; import java.util.*; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/Item.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/Item.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/Item.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -8,12 +8,12 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.hibernate.veditor.editors.autolayout.impl; +package org.jboss.tools.hibernate.ui.veditor.editors.autolayout.impl; import java.util.*; -import org.jboss.tools.hibernate.veditor.editors.autolayout.IItemInfo; -import org.jboss.tools.hibernate.veditor.editors.autolayout.ILinkInfo; +import org.jboss.tools.hibernate.ui.veditor.editors.autolayout.IItemInfo; +import org.jboss.tools.hibernate.ui.veditor.editors.autolayout.ILinkInfo; public class Item { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/Items.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/Items.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/Items.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -8,13 +8,13 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.hibernate.veditor.editors.autolayout.impl; +package org.jboss.tools.hibernate.ui.veditor.editors.autolayout.impl; import java.util.*; -import org.jboss.tools.hibernate.veditor.editors.autolayout.IItemInfo; -import org.jboss.tools.hibernate.veditor.editors.autolayout.ILinkInfo; -import org.jboss.tools.hibernate.veditor.editors.autolayout.IDiagramInfo; +import org.jboss.tools.hibernate.ui.veditor.editors.autolayout.IItemInfo; +import org.jboss.tools.hibernate.ui.veditor.editors.autolayout.ILinkInfo; +import org.jboss.tools.hibernate.ui.veditor.editors.autolayout.IDiagramInfo; public class Items { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/LayuotConstants.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/LayuotConstants.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/LayuotConstants.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.hibernate.veditor.editors.autolayout.impl; +package org.jboss.tools.hibernate.ui.veditor.editors.autolayout.impl; public class LayuotConstants { static int DELTA_X = 200; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/TransitionArranger.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/TransitionArranger.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/autolayout/impl/TransitionArranger.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -8,11 +8,11 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.hibernate.veditor.editors.autolayout.impl; +package org.jboss.tools.hibernate.ui.veditor.editors.autolayout.impl; import java.util.ArrayList; -import org.jboss.tools.hibernate.veditor.editors.autolayout.ILinkInfo; +import org.jboss.tools.hibernate.ui.veditor.editors.autolayout.ILinkInfo; public class TransitionArranger { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/command/ShapeSetConstraintCommand.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/command/ShapeSetConstraintCommand.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/command/ShapeSetConstraintCommand.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -1,21 +1,21 @@ /******************************************************************************* - * 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.veditor.editors.command; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.command; import org.eclipse.draw2d.geometry.Point; import org.eclipse.gef.RequestConstants; import org.eclipse.gef.commands.Command; import org.eclipse.gef.requests.ChangeBoundsRequest; -import org.jboss.tools.hibernate.veditor.editors.model.OrmShape; +import org.jboss.tools.hibernate.ui.veditor.editors.model.OrmShape; public class ShapeSetConstraintCommand extends Command { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/ComponentFigure.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/ComponentFigure.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/ComponentFigure.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -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.veditor.editors.figures; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.figures; import java.util.List; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/RoundLineBorder.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/RoundLineBorder.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/RoundLineBorder.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -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.veditor.editors.figures; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.figures; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.IFigure; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/RoundPolylineConnection.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/RoundPolylineConnection.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/RoundPolylineConnection.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -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.veditor.editors.figures; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.figures; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.PolylineConnection; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/TitleFigure.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/TitleFigure.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/TitleFigure.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -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.veditor.editors.figures; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.figures; import java.util.List; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/TopLineBorder.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/TopLineBorder.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/figures/TopLineBorder.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -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.veditor.editors.figures; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.figures; import org.eclipse.draw2d.Graphics; import org.eclipse.draw2d.IFigure; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ComponentShape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ComponentShape.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ComponentShape.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -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.veditor.editors.model; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.model; import java.util.Iterator; @@ -20,10 +20,6 @@ import org.hibernate.mapping.RootClass; import org.hibernate.mapping.Table; -/** - * @author Konstantin Mishin - * - */ public class ComponentShape extends ExpandeableShape { public static final String SET_CHILDS_HIDEN = "set childs hiden"; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/Connection.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/Connection.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/Connection.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -1,19 +1,15 @@ /******************************************************************************* - * 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.veditor.editors.model; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.model; -/** - * @author Konstantin Mishin - * - */ public class Connection extends ModelElement { public static final String HIDE_SELECTION = "hide selection"; public static final String SHOW_SELECTION = "show selection"; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ExpandeableShape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ExpandeableShape.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ExpandeableShape.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -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.veditor.editors.model; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.model; import java.beans.PropertyChangeEvent; import java.util.ArrayList; @@ -16,12 +16,8 @@ import java.util.List; import org.eclipse.swt.graphics.RGB; -import org.jboss.tools.hibernate.veditor.editors.parts.ResourceManager; +import org.jboss.tools.hibernate.ui.veditor.editors.parts.ResourceManager; -/** - * @author Konstantin Mishin - * - */ public class ExpandeableShape extends Shape { public static final String SHOW_REFERENCES = "show references"; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ModelElement.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ModelElement.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/ModelElement.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -1,24 +1,20 @@ /******************************************************************************* - * 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.veditor.editors.model; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.model; import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.util.ArrayList; import java.util.List; -/** - * @author Konstantin Mishin - * - */ public abstract class ModelElement{ private transient PropertyChangeSupport pcsDelegate = new PropertyChangeSupport(this); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmShape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmShape.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/OrmShape.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -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.veditor.editors.model; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.model; import java.util.Iterator; @@ -23,10 +23,6 @@ import org.hibernate.mapping.SingleTableSubclass; import org.hibernate.mapping.Table; -/** - * @author Konstantin Mishin - * - */ public class OrmShape extends ExpandeableShape { public static final String SET_HIDEN = "set hiden"; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/Shape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/Shape.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/Shape.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -1,22 +1,18 @@ /******************************************************************************* - * 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.veditor.editors.model; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.model; import java.util.ArrayList; import java.util.List; -/** - * @author Konstantin Mishin - * - */ public class Shape extends ModelElement { private int indent = 0; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/SpecialOrmShape.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/SpecialOrmShape.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/SpecialOrmShape.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -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.veditor.editors.model; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.model; import java.util.Iterator; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/SpecialRootClass.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/SpecialRootClass.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/model/SpecialRootClass.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -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.veditor.editors.model; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.model; import java.util.Iterator; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ComponentShapeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ComponentShapeEditPart.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ComponentShapeEditPart.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -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.veditor.editors.parts; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.parts; import java.beans.PropertyChangeEvent; import java.util.List; @@ -25,13 +25,9 @@ import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; import org.eclipse.swt.graphics.RGB; -import org.jboss.tools.hibernate.veditor.editors.figures.ComponentFigure; -import org.jboss.tools.hibernate.veditor.editors.figures.TitleFigure; -import org.jboss.tools.hibernate.veditor.editors.figures.TitleLabel; -import org.jboss.tools.hibernate.veditor.editors.model.ComponentShape; -import org.jboss.tools.hibernate.veditor.editors.model.OrmDiagram; -import org.jboss.tools.hibernate.veditor.editors.model.OrmShape; -import org.jboss.tools.hibernate.veditor.editors.model.Shape; +import org.jboss.tools.hibernate.ui.veditor.editors.figures.ComponentFigure; +import org.jboss.tools.hibernate.ui.veditor.editors.model.ComponentShape; +import org.jboss.tools.hibernate.ui.veditor.editors.model.OrmDiagram; public class ComponentShapeEditPart extends ExpandeableShapeEditPart { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ConnectionEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ConnectionEditPart.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ConnectionEditPart.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -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.veditor.editors.parts; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.parts; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -16,7 +16,6 @@ import org.eclipse.draw2d.IFigure; import org.eclipse.draw2d.PolygonDecoration; import org.eclipse.draw2d.PolylineConnection; -import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; import org.eclipse.gef.editparts.AbstractConnectionEditPart; import org.eclipse.gef.editpolicies.SelectionEditPolicy; @@ -28,16 +27,12 @@ import org.hibernate.mapping.RootClass; import org.hibernate.mapping.SingleTableSubclass; import org.hibernate.mapping.Table; -import org.jboss.tools.hibernate.veditor.editors.figures.RoundPolylineConnection; -import org.jboss.tools.hibernate.veditor.editors.model.Connection; -import org.jboss.tools.hibernate.veditor.editors.model.ModelElement; +import org.jboss.tools.hibernate.ui.veditor.editors.figures.RoundPolylineConnection; +import org.jboss.tools.hibernate.ui.veditor.editors.model.Connection; +import org.jboss.tools.hibernate.ui.veditor.editors.model.ModelElement; -/** - * @author Konstantin Mishin - * - */ class ConnectionEditPart extends AbstractConnectionEditPart implements PropertyChangeListener { @@ -83,10 +78,8 @@ private Color getColor() { Object element = getCastedModel().getTarget().getOrmElement(); -//R if (getCastedModel().getTarget().getOrmElement() instanceof IPersistentClass) if (element instanceof RootClass || element instanceof SingleTableSubclass) return ResourceManager.getInstance().getColor(new RGB(210,155,100)); -//R else if (getCastedModel().getTarget().getOrmElement() instanceof IDatabaseColumn || getCastedModel().getTarget().getOrmElement() instanceof IDatabaseTable) else if (element instanceof Column || element instanceof Table || element instanceof Property) return ResourceManager.getInstance().getColor(new RGB(160, 160, 160)); else Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ExpandeableShapeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ExpandeableShapeEditPart.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ExpandeableShapeEditPart.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -1,35 +1,24 @@ /******************************************************************************* - * 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.veditor.editors.parts; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.parts; import java.beans.PropertyChangeEvent; -import java.util.Iterator; import java.util.List; -import org.eclipse.draw2d.FocusBorder; import org.eclipse.draw2d.IFigure; -import org.eclipse.draw2d.Label; -import org.eclipse.draw2d.MarginBorder; -import org.eclipse.draw2d.PositionConstants; -import org.eclipse.draw2d.ToolbarLayout; import org.eclipse.gef.Request; import org.eclipse.gef.RequestConstants; import org.eclipse.swt.graphics.RGB; -import org.jboss.tools.hibernate.veditor.editors.figures.TitleFigure; -import org.jboss.tools.hibernate.veditor.editors.figures.TitleLabel; -import org.jboss.tools.hibernate.veditor.editors.model.ComponentShape; -import org.jboss.tools.hibernate.veditor.editors.model.Connection; -import org.jboss.tools.hibernate.veditor.editors.model.ExpandeableShape; -import org.jboss.tools.hibernate.veditor.editors.model.OrmShape; -import org.jboss.tools.hibernate.veditor.editors.model.Shape; +import org.jboss.tools.hibernate.ui.veditor.editors.model.ExpandeableShape; +import org.jboss.tools.hibernate.ui.veditor.editors.model.Shape; public class ExpandeableShapeEditPart extends ShapeEditPart { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/Messages.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/Messages.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -1,19 +1,19 @@ /******************************************************************************* - * 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.veditor.editors.parts; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.parts; import org.eclipse.osgi.util.NLS; public class Messages extends NLS { - private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.veditor.editors.parts.messages"; //$NON-NLS-1$ + private static final String BUNDLE_NAME = "org.jboss.tools.hibernate.ui.veditor.editors.parts.messages"; //$NON-NLS-1$ private Messages() { } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/OrmEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/OrmEditPart.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/OrmEditPart.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -8,7 +8,7 @@ * Contributor: * Red Hat, Inc. - initial API and implementation ******************************************************************************/ -package org.jboss.tools.hibernate.veditor.editors.parts; +package org.jboss.tools.hibernate.ui.veditor.editors.parts; import java.util.ArrayList; import java.util.HashMap; Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/OrmEditPartFactory.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/OrmEditPartFactory.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/OrmEditPartFactory.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -1,29 +1,25 @@ /******************************************************************************* - * 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.veditor.editors.parts; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.parts; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPartFactory; -import org.jboss.tools.hibernate.veditor.editors.model.ComponentShape; -import org.jboss.tools.hibernate.veditor.editors.model.Connection; -import org.jboss.tools.hibernate.veditor.editors.model.ExpandeableShape; -import org.jboss.tools.hibernate.veditor.editors.model.OrmDiagram; -import org.jboss.tools.hibernate.veditor.editors.model.OrmShape; -import org.jboss.tools.hibernate.veditor.editors.model.Shape; +import org.jboss.tools.hibernate.ui.veditor.editors.model.ComponentShape; +import org.jboss.tools.hibernate.ui.veditor.editors.model.Connection; +import org.jboss.tools.hibernate.ui.veditor.editors.model.ExpandeableShape; +import org.jboss.tools.hibernate.ui.veditor.editors.model.OrmDiagram; +import org.jboss.tools.hibernate.ui.veditor.editors.model.OrmShape; +import org.jboss.tools.hibernate.ui.veditor.editors.model.Shape; -/** - * @author Konstantin Mishin - * - */ public class OrmEditPartFactory implements EditPartFactory { Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/OrmShapeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/OrmShapeEditPart.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/OrmShapeEditPart.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -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.veditor.editors.parts; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.parts; import java.beans.PropertyChangeEvent; @@ -33,18 +33,14 @@ import org.hibernate.mapping.RootClass; import org.hibernate.mapping.SingleTableSubclass; import org.hibernate.mapping.Table; -import org.jboss.tools.hibernate.veditor.editors.figures.RoundLineBorder; -import org.jboss.tools.hibernate.veditor.editors.figures.TitleFigure; -import org.jboss.tools.hibernate.veditor.editors.figures.TitleLabel; -import org.jboss.tools.hibernate.veditor.editors.model.ExpandeableShape; -import org.jboss.tools.hibernate.veditor.editors.model.OrmDiagram; -import org.jboss.tools.hibernate.veditor.editors.model.OrmShape; +import org.jboss.tools.hibernate.ui.veditor.editors.figures.RoundLineBorder; +import org.jboss.tools.hibernate.ui.veditor.editors.figures.TitleFigure; +import org.jboss.tools.hibernate.ui.veditor.editors.figures.TitleLabel; +import org.jboss.tools.hibernate.ui.veditor.editors.model.ExpandeableShape; +import org.jboss.tools.hibernate.ui.veditor.editors.model.OrmDiagram; +import org.jboss.tools.hibernate.ui.veditor.editors.model.OrmShape; -/** - * @author Konstantin Mishin - * - */ public class OrmShapeEditPart extends ExpandeableShapeEditPart{ protected IFigure createFigure() { @@ -119,10 +115,8 @@ protected Color getBackgroundColor() { Object element = getCastedModel().getOrmElement(); -//R if (getCastedModel().getOrmElement() instanceof IPersistentClass) if (element instanceof PersistentClass || element instanceof Component) return ResourceManager.getInstance().getColor(new RGB(0,0,0)); -//R else if (getCastedModel().getOrmElement() instanceof IDatabaseTable) else if (element instanceof Table || element instanceof Property) return ResourceManager.getInstance().getColor(new RGB( Integer.parseInt(Messages.Colors_DatabaseColumnR), Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ResourceManager.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ResourceManager.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ResourceManager.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -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.veditor.editors.parts; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.parts; import java.util.HashMap; import java.util.Iterator; @@ -20,10 +20,6 @@ import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.widgets.Display; -/** - * @author Konstantin Mishin - * - */ public class ResourceManager { private Map<RGB,Color> fColorTable = new HashMap<RGB,Color>(10); Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ShapeEditPart.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ShapeEditPart.java 2007-07-05 09:45:40 UTC (rev 2297) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate.ui.veditor/src/org/jboss/tools/hibernate/veditor/editors/parts/ShapeEditPart.java 2007-07-05 11:05:24 UTC (rev 2298) @@ -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.veditor.editors.parts; + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.hibernate.ui.veditor.editors.parts; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -42,15 +42,15 @@ import org.hibernate.mapping.RootClass; import org.hibernate.mapping.SimpleValue; import org.hibernate.mapping.Table; -import org.jboss.tools.hibernate.veditor.editors.figures.TitleFigure; -import org.jboss.tools.hibernate.veditor.editors.figures.TopLineBorder; -import org.jboss.tools.hibernate.veditor.editors.model.Connection; -import org.jboss.tools.hibernate.veditor.editors.model.ModelElement; -import org.jboss.tools.hibernate.veditor.editors.model.Shape; -import org.jboss.tools.hibernate.veditor.editors.model.SpecialRootClass; -import org.jboss.tools.hibernate.view.views.OrmLabelProvider; -import org.jboss.tools.hibernate.view.views.OrmModelImageVisitor; -import org.jboss.tools.hibernate.view.views.OrmModelNameVisitor; +import org.jboss.tools.hibernate.ui.veditor.editors.figures.TitleFigure; +import org.jboss.tools.hibernate.ui.veditor.editors.figures.TopLineBorder; +import org.jboss.tools.hibernate.ui.veditor.editors.model.Connection; +import org.jboss.tools.hibernate.ui.veditor.editors.model.ModelElement; +import org.jboss.tools.hibernate.ui.veditor.editors.model.Shape; +import org.jboss.tools.hibernate.ui.veditor.editors.model.SpecialRootClass; +import org.jboss.tools.hibernate.ui.view.views.OrmLabelProvider; +import org.jboss.tools.hibernate.ui.view.views.OrmModelImageVisitor; +import org.jboss.tools.hibernate.ui.view.views.OrmModelNameVisitor; public class ShapeEditPart extends