From b5370a1796b5014cc66977827e97ceae3a1fa2e3 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Sun, 7 Jul 2024 11:29:31 +0900 Subject: [PATCH] Fix warnings (#33) --- .../java/amateras/db/util/DatabaseInfo.java | 5 +- .../java/amateras/db/util/JarClassLoader.java | 32 +-- .../amateras/db/validator/DiagramErrors.java | 2 +- .../db/visual/action/AutoLayoutAction.java | 2 +- .../db/visual/editor/VisualDBEditor.java | 23 +-- .../editpart/AbstractDBEntityEditPart.java | 14 +- .../editpart/ManhattanConnectionRouter.java | 24 +-- .../db/visual/editpart/RootEditPart.java | 27 ++- .../editpart/tree/TableTreeEditPart.java | 1 - .../db/visual/model/AbstractDBModel.java | 2 +- .../amateras/db/visual/model/RootModel.java | 4 +- .../db/wizard/NewDiagramWizardPage2.java | 8 +- .../net/java/amateras/uml/DiagramEditor.java | 194 ++++++++---------- .../java/amateras/uml/UMLImageRegistry.java | 7 +- .../src/net/java/amateras/uml/UMLPlugin.java | 10 +- .../editpart/VerticalPartitionEditPart.java | 7 - .../figure/ext/ActionFigureEx.java | 2 + .../activitydiagram/model/ActivityModel.java | 2 +- .../classdiagram/action/AutoLayoutAction.java | 4 +- .../classdiagram/action/ShowPublicAction.java | 12 +- .../uml/classdiagram/action/ToggleAction.java | 6 +- .../editpart/CommonEntityEditPart.java | 1 - .../classdiagram/model/AttributeModel.java | 8 +- .../uml/classdiagram/model/ClassModel.java | 4 +- .../classdiagram/model/OperationModel.java | 129 ++++++------ .../amateras/uml/editpart/RootEditPart.java | 113 +++++----- .../amateras/uml/model/AbstractUMLModel.java | 4 +- .../properties/BooleanPropertyDescriptor.java | 62 +++--- .../sequencediagram/model/InstanceModel.java | 9 +- .../model/InteractionModel.java | 34 +-- .../sequencediagram/model/LifeLineModel.java | 5 +- .../sequencediagram/model/MessageModel.java | 24 +-- .../model/MessageOrderUtil.java | 32 +-- .../model/SequenceModelBuilder.java | 97 ++++----- .../model/SyncMessageModel.java | 8 +- .../property/MessagePropertyDescriptor.java | 11 +- .../property/MessageTextCellEditor.java | 8 +- .../uml/usecasediagram/MultiPageEditor.java | 6 +- .../model/UsecaseRootModel.java | 10 +- 39 files changed, 461 insertions(+), 492 deletions(-) diff --git a/net.java.amateras.db/src/net/java/amateras/db/util/DatabaseInfo.java b/net.java.amateras.db/src/net/java/amateras/db/util/DatabaseInfo.java index 7d3e5dc..0d6fdb4 100644 --- a/net.java.amateras.db/src/net/java/amateras/db/util/DatabaseInfo.java +++ b/net.java.amateras.db/src/net/java/amateras/db/util/DatabaseInfo.java @@ -1,5 +1,6 @@ package net.java.amateras.db.util; +import java.lang.reflect.InvocationTargetException; import java.sql.Connection; import java.sql.DatabaseMetaData; import java.sql.Driver; @@ -28,8 +29,8 @@ public class DatabaseInfo { final public String DERBY = "Apache Derby"; final public String SYBASE = "Adaptive Server Enterprise"; - public DatabaseInfo(Class driverClass) throws InstantiationException, IllegalAccessException { - driver = (Driver) driverClass.newInstance(); + public DatabaseInfo(Class driverClass) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException { + driver = (Driver) driverClass.getDeclaredConstructor().newInstance(); } public void setURI(String uri) { diff --git a/net.java.amateras.db/src/net/java/amateras/db/util/JarClassLoader.java b/net.java.amateras.db/src/net/java/amateras/db/util/JarClassLoader.java index be2e45f..ac0e2f4 100644 --- a/net.java.amateras.db/src/net/java/amateras/db/util/JarClassLoader.java +++ b/net.java.amateras.db/src/net/java/amateras/db/util/JarClassLoader.java @@ -38,21 +38,29 @@ public java.util.List> getJDBCDriverClass(String jarName) throws IOExce if(jarName.equals("")){ return Collections.emptyList(); } - JarFile jarFile = new JarFile(jarName); - Enumeration e = jarFile.entries(); + ArrayList> list = new ArrayList>(); - while(e.hasMoreElements()){ - JarEntry entry = (JarEntry)e.nextElement(); - String name = entry.getName(); - if(name.lastIndexOf(".class")!=-1){ - String ccls = name.replaceFirst(".class","").replaceAll("/","."); - try { - Class cls = loadClass(ccls,true); - getJDBCDriverClass(list, cls ,cls); - } catch (NoClassDefFoundError ex) { - } catch (ClassNotFoundException ex) { + JarFile jarFile = new JarFile(jarName); + try { + Enumeration e = jarFile.entries(); + while(e.hasMoreElements()){ + JarEntry entry = (JarEntry)e.nextElement(); + String name = entry.getName(); + if(name.lastIndexOf(".class")!=-1){ + String ccls = name.replaceFirst(".class","").replaceAll("/","."); + try { + Class cls = loadClass(ccls,true); + getJDBCDriverClass(list, cls ,cls); + } catch (NoClassDefFoundError ex) { + } catch (ClassNotFoundException ex) { + } } } + } finally { + try { + jarFile.close(); + } catch (Exception ex) { + } } return list; } diff --git a/net.java.amateras.db/src/net/java/amateras/db/validator/DiagramErrors.java b/net.java.amateras.db/src/net/java/amateras/db/validator/DiagramErrors.java index 109b689..f6b69e9 100644 --- a/net.java.amateras.db/src/net/java/amateras/db/validator/DiagramErrors.java +++ b/net.java.amateras.db/src/net/java/amateras/db/validator/DiagramErrors.java @@ -181,7 +181,7 @@ private static void addMarker(IResource resource, int type, String message){ try { IMarker marker = resource.createMarker(IMarker.PROBLEM); Map map = new HashMap(); - map.put(IMarker.SEVERITY, new Integer(type)); + map.put(IMarker.SEVERITY, type); map.put(IMarker.MESSAGE, message); // map.put(IMarker.LINE_NUMBER,new Integer(line)); marker.setAttributes(map); diff --git a/net.java.amateras.db/src/net/java/amateras/db/visual/action/AutoLayoutAction.java b/net.java.amateras.db/src/net/java/amateras/db/visual/action/AutoLayoutAction.java index e8b9ccd..3f4533f 100644 --- a/net.java.amateras.db/src/net/java/amateras/db/visual/action/AutoLayoutAction.java +++ b/net.java.amateras.db/src/net/java/amateras/db/visual/action/AutoLayoutAction.java @@ -87,7 +87,7 @@ public void run() { graph.edges = graphEdges; new DirectedGraphLayout().visit(graph); for (int i = 0; i < graph.nodes.size(); i++) { - EntityNode node = (EntityNode) graph.nodes.getNode(i); + EntityNode node = (EntityNode) graph.nodes.get(i); commands.add(new LayoutCommand(node.model, node.x, node.y)); } diff --git a/net.java.amateras.db/src/net/java/amateras/db/visual/editor/VisualDBEditor.java b/net.java.amateras.db/src/net/java/amateras/db/visual/editor/VisualDBEditor.java index 3cdea4c..6cb80c4 100644 --- a/net.java.amateras.db/src/net/java/amateras/db/visual/editor/VisualDBEditor.java +++ b/net.java.amateras.db/src/net/java/amateras/db/visual/editor/VisualDBEditor.java @@ -146,7 +146,6 @@ protected void setInput(IEditorInput input) { setPartName(input.getName()); } - @SuppressWarnings("unchecked") protected void initializeGraphicalViewer() { GraphicalViewer viewer = getGraphicalViewer(); @@ -383,13 +382,13 @@ private boolean savePreviouslyNeeded() { * @param icon the icon path * @return created PaletteEntry */ - private PaletteEntry createConnectionEntry(String itemName, Class clazz, String icon){ + private PaletteEntry createConnectionEntry(String itemName, Class clazz, String icon){ ImageDescriptor image = null; if(icon!=null){ image = DBPlugin.getImageDescriptor(icon); } ConnectionCreationToolEntry entry = new ConnectionCreationToolEntry( - itemName, itemName, new SimpleFactory(clazz), image, image); + itemName, itemName, new SimpleFactory(clazz), image, image); return entry; } @@ -401,21 +400,21 @@ private PaletteEntry createConnectionEntry(String itemName, Class clazz, Stri * @param icon the icon path * @return created PaletteEntry */ - private PaletteEntry createEntityEntry(String itemName,Class clazz,String icon){ + private PaletteEntry createEntityEntry(String itemName,Class clazz,String icon){ ImageDescriptor image = null; if(icon!=null){ image = DBPlugin.getImageDescriptor(icon); } CreationToolEntry entry = new CreationToolEntry( - itemName, itemName, new SimpleFactory(clazz), image, image); + itemName, itemName, new SimpleFactory(clazz), image, image); return entry; } - @SuppressWarnings("rawtypes") - public Object getAdapter(Class type){ + @SuppressWarnings("unchecked") + public T getAdapter(Class type){ if(type == IContentOutlinePage.class){ - return this.outlinePage; + return (T) this.outlinePage; } return super.getAdapter(type); } @@ -427,7 +426,7 @@ private void refreshGraphicalViewer() { IFile file = ((IFileEditorInput) input).getFile(); GraphicalViewer viewer = getGraphicalViewer(); - // desirialize + // deserialize RootModel newRoot = null; try { newRoot = VisualDBSerializer.deserialize(file.getContents()); @@ -483,16 +482,16 @@ protected void applyPreferences(){ IPreferenceStore store = DBPlugin.getDefault().getPreferenceStore(); getGraphicalViewer().setProperty(SnapToGrid.PROPERTY_GRID_ENABLED, - new Boolean(store.getBoolean(DBPlugin.PREF_SHOW_GRID))); + store.getBoolean(DBPlugin.PREF_SHOW_GRID)); getGraphicalViewer().setProperty(SnapToGrid.PROPERTY_GRID_VISIBLE, - new Boolean(store.getBoolean(DBPlugin.PREF_SHOW_GRID))); + store.getBoolean(DBPlugin.PREF_SHOW_GRID)); int gridSize = store.getInt(DBPlugin.PREF_GRID_SIZE); getGraphicalViewer().setProperty(SnapToGrid.PROPERTY_GRID_SPACING, new Dimension(gridSize, gridSize)); getGraphicalViewer().setProperty(SnapToGeometry.PROPERTY_SNAP_ENABLED, - new Boolean(store.getBoolean(DBPlugin.PREF_SNAP_GEOMETRY))); + store.getBoolean(DBPlugin.PREF_SNAP_GEOMETRY)); boolean isZoomableWithCtrlAndScroll = store.getBoolean(DBPlugin.PREF_ZOOMABLE_WITH_CTRL_AND_SCROLL); String mouseWheelHandlerKey = MouseWheelHandler.KeyGenerator.getKey(SWT.CTRL); diff --git a/net.java.amateras.db/src/net/java/amateras/db/visual/editpart/AbstractDBEntityEditPart.java b/net.java.amateras.db/src/net/java/amateras/db/visual/editpart/AbstractDBEntityEditPart.java index 2fe39d1..0e12122 100644 --- a/net.java.amateras.db/src/net/java/amateras/db/visual/editpart/AbstractDBEntityEditPart.java +++ b/net.java.amateras.db/src/net/java/amateras/db/visual/editpart/AbstractDBEntityEditPart.java @@ -1,7 +1,6 @@ package net.java.amateras.db.visual.editpart; import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.util.ArrayList; import java.util.List; @@ -31,7 +30,7 @@ public abstract class AbstractDBEntityEditPart extends AbstractDBEditPart implements NodeEditPart { /** - * Creats a {@link CreateConnectionCommand} instance. + * Creates a {@link CreateConnectionCommand} instance. * Override to return an instance of extended class to customize connection creation. * * @return the connection creation command @@ -79,19 +78,18 @@ public ConnectionAnchor getTargetConnectionAnchor(Request request) { return new ChopboxAnchor(getFigure()); } - @SuppressWarnings("unchecked") public void propertyChange(PropertyChangeEvent evt) { refreshVisuals(); refreshSourceConnections(); refreshTargetConnections(); - invokePropertyChangeListener(evt, (List) getSourceConnections()); - invokePropertyChangeListener(evt, (List) getTargetConnections()); + invokePropertyChangeListener(evt, getSourceConnections()); + invokePropertyChangeListener(evt, getTargetConnections()); } - private void invokePropertyChangeListener(PropertyChangeEvent evt, List listeners){ - for(PropertyChangeListener listener: listeners){ - listener.propertyChange(evt); + private void invokePropertyChangeListener(PropertyChangeEvent evt, List listeners){ + for(ConnectionEditPart listener: listeners){ + ((AbstractDBConnectionEditPart) listener).propertyChange(evt); } } diff --git a/net.java.amateras.db/src/net/java/amateras/db/visual/editpart/ManhattanConnectionRouter.java b/net.java.amateras.db/src/net/java/amateras/db/visual/editpart/ManhattanConnectionRouter.java index 416c7ce..a82ea27 100644 --- a/net.java.amateras.db/src/net/java/amateras/db/visual/editpart/ManhattanConnectionRouter.java +++ b/net.java.amateras.db/src/net/java/amateras/db/visual/editpart/ManhattanConnectionRouter.java @@ -72,7 +72,7 @@ private int getColumnNear(Connection connection, int r, int n, int x) { r--; Integer i; while (proximity < r) { - i = new Integer(r + proximity * direction); + i = r + proximity * direction; if (!colsUsed.containsKey(i)) { colsUsed.put(i, i); reserveColumn(connection, i); @@ -159,7 +159,7 @@ protected int getRowNear(Connection connection, int r, int n, int x) { r--; Integer i; while (proximity < r) { - i = new Integer(r + proximity * direction); + i = r + proximity * direction; if (!rowsUsed.containsKey(i)) { rowsUsed.put(i, i); reserveRow(connection, i); @@ -316,9 +316,9 @@ public void route(Connection conn) { List positions = new ArrayList(5); if (horizontal) - positions.add(new Integer(start.y)); + positions.add(start.y); else - positions.add(new Integer(start.x)); + positions.add(start.x); horizontal = !horizontal; if (startNormal.dotProduct(endNormal) == 0) { @@ -335,7 +335,7 @@ public void route(Connection conn) { else i = average.x; } - positions.add(new Integer(i)); + positions.add(i); horizontal = !horizontal; if (endNormal.dotProduct(direction) > 0) @@ -346,7 +346,7 @@ public void route(Connection conn) { else i = average.x; } - positions.add(new Integer(i + (duplicationCount * interval))); + positions.add(i + (duplicationCount * interval)); horizontal = !horizontal; } } else { @@ -356,13 +356,13 @@ public void route(Connection conn) { i = startNormal.similarity(start.getAdded(startNormal.getScaled(10))); else i = endNormal.similarity(end.getAdded(endNormal.getScaled(10))); - positions.add(new Integer(i + (duplicationCount * interval))); + positions.add(i + (duplicationCount * interval)); horizontal = !horizontal; } else { //3 or 1 if (startNormal.dotProduct(direction) < 0) { i = startNormal.similarity(start.getAdded(startNormal.getScaled(10))); - positions.add(new Integer(i + (duplicationCount * interval))); + positions.add(i + (duplicationCount * interval)); horizontal = !horizontal; } @@ -370,20 +370,20 @@ public void route(Connection conn) { i = average.y; else i = average.x; - positions.add(new Integer(i + (duplicationCount * interval))); + positions.add(i + (duplicationCount * interval)); horizontal = !horizontal; if (startNormal.dotProduct(direction) < 0) { i = endNormal.similarity(end.getAdded(endNormal.getScaled(10))); - positions.add(new Integer(i + (duplicationCount * interval))); + positions.add(i + (duplicationCount * interval)); horizontal = !horizontal; } } } if (horizontal) - positions.add(new Integer(end.y)); + positions.add(end.y); else - positions.add(new Integer(end.x)); + positions.add(end.x); processPositions(start, end, positions, startNormal.isHorizontal(), conn); } diff --git a/net.java.amateras.db/src/net/java/amateras/db/visual/editpart/RootEditPart.java b/net.java.amateras.db/src/net/java/amateras/db/visual/editpart/RootEditPart.java index 057532f..9449afb 100644 --- a/net.java.amateras.db/src/net/java/amateras/db/visual/editpart/RootEditPart.java +++ b/net.java.amateras.db/src/net/java/amateras/db/visual/editpart/RootEditPart.java @@ -17,8 +17,10 @@ import org.eclipse.draw2d.XYLayout; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.gef.CompoundSnapToHelper; +import org.eclipse.gef.ConnectionEditPart; import org.eclipse.gef.EditPart; import org.eclipse.gef.EditPolicy; +import org.eclipse.gef.GraphicalEditPart; import org.eclipse.gef.Request; import org.eclipse.gef.SnapToGeometry; import org.eclipse.gef.SnapToGrid; @@ -58,9 +60,8 @@ public void propertyChange(PropertyChangeEvent evt) { refreshChildren(); } if (evt.getPropertyName().equals(RootModel.P_FONT)) { - @SuppressWarnings("unchecked") - List children = (List) getChildren(); - for(AbstractDBEntityEditPart part: children){ + List children = getChildren(); + for(GraphicalEditPart part: children){ part.refresh(); for(Object conn: part.getSourceConnections()){ ((AbstractDBConnectionEditPart) conn).refresh(); @@ -68,13 +69,11 @@ public void propertyChange(PropertyChangeEvent evt) { } } if (evt.getPropertyName().equals(RootModel.P_MODE)) { - @SuppressWarnings("unchecked") - List children = (List) getChildren(); - for(AbstractDBEntityEditPart part: children){ + List children = getChildren(); + for(GraphicalEditPart part: children){ part.refresh(); - @SuppressWarnings("unchecked") - List conns = (List) part.getSourceConnections(); - for(AbstractDBConnectionEditPart conn: conns){ + List conns = part.getSourceConnections(); + for(ConnectionEditPart conn: conns){ conn.refresh(); } } @@ -175,8 +174,8 @@ public void undo() { } } - @SuppressWarnings("rawtypes") - public Object getAdapter(Class adapter) { + @SuppressWarnings("unchecked") + public T getAdapter(Class adapter) { if (adapter == SnapToHelper.class) { List snapStrategies = new ArrayList(); Boolean val = (Boolean)getViewer().getProperty(RulerProvider.PROPERTY_RULER_VISIBILITY); @@ -192,12 +191,12 @@ public Object getAdapter(Class adapter) { if (snapStrategies.size() == 0) return null; if (snapStrategies.size() == 1) - return (SnapToHelper)snapStrategies.get(0); + return (T) snapStrategies.get(0); SnapToHelper ss[] = new SnapToHelper[snapStrategies.size()]; for (int i = 0; i < snapStrategies.size(); i++) - ss[i] = (SnapToHelper)snapStrategies.get(i); - return new CompoundSnapToHelper(ss); + ss[i] = (SnapToHelper) snapStrategies.get(i); + return (T) new CompoundSnapToHelper(ss); } return super.getAdapter(adapter); } diff --git a/net.java.amateras.db/src/net/java/amateras/db/visual/editpart/tree/TableTreeEditPart.java b/net.java.amateras.db/src/net/java/amateras/db/visual/editpart/tree/TableTreeEditPart.java index 2ac2e83..c8d9081 100644 --- a/net.java.amateras.db/src/net/java/amateras/db/visual/editpart/tree/TableTreeEditPart.java +++ b/net.java.amateras.db/src/net/java/amateras/db/visual/editpart/tree/TableTreeEditPart.java @@ -15,7 +15,6 @@ import net.java.amateras.db.visual.model.TableModel; import org.eclipse.gef.TreeEditPart; -import org.eclipse.gef.editparts.AbstractEditPart; import org.eclipse.jface.resource.CompositeImageDescriptor; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; diff --git a/net.java.amateras.db/src/net/java/amateras/db/visual/model/AbstractDBModel.java b/net.java.amateras.db/src/net/java/amateras/db/visual/model/AbstractDBModel.java index 99a7106..6b6ab86 100644 --- a/net.java.amateras.db/src/net/java/amateras/db/visual/model/AbstractDBModel.java +++ b/net.java.amateras.db/src/net/java/amateras/db/visual/model/AbstractDBModel.java @@ -12,7 +12,7 @@ public void addPropertyChangeListener(PropertyChangeListener listener) { listeners.addPropertyChangeListener(listener); } - public void firePropertyChange(String propName, Object oldValue,Object newValue) { + public void firePropertyChange(String propName, Object oldValue, Object newValue) { listeners.firePropertyChange(propName, oldValue, newValue); } diff --git a/net.java.amateras.db/src/net/java/amateras/db/visual/model/RootModel.java b/net.java.amateras.db/src/net/java/amateras/db/visual/model/RootModel.java index b141ea1..0003147 100644 --- a/net.java.amateras.db/src/net/java/amateras/db/visual/model/RootModel.java +++ b/net.java.amateras.db/src/net/java/amateras/db/visual/model/RootModel.java @@ -143,12 +143,12 @@ public boolean isIncludeView() { public void setIncludeView(boolean includeView) { this.includeView = includeView; - firePropertyChange(P_JDBC_INFO, null, new Boolean(jdbcCatalog)); + firePropertyChange(P_JDBC_INFO, null, includeView); } public void setLogicalMode(boolean logicalMode){ this.logicalMode = logicalMode; - firePropertyChange(P_MODE, null, new Boolean(logicalMode)); + firePropertyChange(P_MODE, null, logicalMode); } public boolean getLogicalMode(){ diff --git a/net.java.amateras.db/src/net/java/amateras/db/wizard/NewDiagramWizardPage2.java b/net.java.amateras.db/src/net/java/amateras/db/wizard/NewDiagramWizardPage2.java index fd327f9..3bf8c76 100644 --- a/net.java.amateras.db/src/net/java/amateras/db/wizard/NewDiagramWizardPage2.java +++ b/net.java.amateras.db/src/net/java/amateras/db/wizard/NewDiagramWizardPage2.java @@ -1,5 +1,6 @@ package net.java.amateras.db.wizard; +import java.net.URI; import java.net.URL; import java.sql.Connection; import java.sql.SQLException; @@ -251,12 +252,9 @@ private void loadJdbcDriver(){ IFile file = wsroot.getFile(new Path(jarFilePath)); jarFilePath = file.getLocation().makeAbsolute().toString(); - - jarURL = new URL("file:///" + jarFilePath); - - } else { - jarURL = new URL("file:///" + jarFilePath); } + + jarURL = new URI("file:///" + jarFilePath).toURL(); URL[] clspath = new URL[classpathes.length + 1]; clspath[0] = jarURL; diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/DiagramEditor.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/DiagramEditor.java index 00ed0c8..149ef4d 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/DiagramEditor.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/DiagramEditor.java @@ -93,16 +93,16 @@ * @author Takahiro Shida. */ public abstract class DiagramEditor extends GraphicalEditorWithPalette - implements IPropertyChangeListener, IResourceChangeListener { + implements IPropertyChangeListener, IResourceChangeListener { private boolean savePreviouslyNeeded = false; private boolean need2Serialize = false; private IEditorPart activeEditorBeforeSynchronization = null; private List editorsOpenedDuringSynchronization = new ArrayList(); - private AbstractUMLEditorAction openOutlineAction = null; + private AbstractUMLEditorAction openOutlineAction = null; private AbstractUMLEditorAction openPropertyAction = null; - private AbstractUMLEditorAction saveAsImageAction = null; - private AbstractUMLEditorAction copyAsImageAction = null; + private AbstractUMLEditorAction saveAsImageAction = null; + private AbstractUMLEditorAction copyAsImageAction = null; private boolean needViewerRefreshFlag = true; private final List asyncActionList = new ArrayList(); @@ -123,17 +123,17 @@ public DiagramEditor() { @Override protected void initializeGraphicalViewer() { GraphicalViewer viewer = getGraphicalViewer(); - IFile file = ((IFileEditorInput)getEditorInput()).getFile(); + IFile file = ((IFileEditorInput) getEditorInput()).getFile(); RootModel root = null; - if(file.exists()){ + if (file.exists()) { try { root = DiagramSerializer.deserialize(file.getContents()); validateModel(root); - } catch(Exception ex){ + } catch (Exception ex) { UMLPlugin.logException(ex); } } - if(root == null){ + if (root == null) { root = createInitializeModel(); } viewer.setContents(root); @@ -141,7 +141,7 @@ protected void initializeGraphicalViewer() { applyPreferences(); } - private void refreshGraphicalViewer(){ + private void refreshGraphicalViewer() { IEditorInput input = getEditorInput(); if (input instanceof IFileEditorInput) { try { @@ -152,7 +152,7 @@ private void refreshGraphicalViewer(){ RootModel newRoot = null; try { newRoot = DiagramSerializer.deserialize(file.getContents()); - } catch(Exception ex){ + } catch (Exception ex) { UMLPlugin.logException(ex); return; } @@ -193,7 +193,7 @@ public void run() { doSave(new NullProgressMonitor()); need2Serialize = false; } - if(needViewerRefreshFlag){ + if (needViewerRefreshFlag) { refreshGraphicalViewer(); } else { needViewerRefreshFlag = true; @@ -214,9 +214,11 @@ public void run() { } /** - * The diagram has been modified and need to be saved later (asynchronous) on next refresh + * The diagram has been modified and need to be saved later (asynchronous) on + * next refresh */ - public void need2Serialize(IEditorPart activeEditorBeforeSynchronization, List editorsOpenedDuringSynchronization) { + public void need2Serialize(IEditorPart activeEditorBeforeSynchronization, + List editorsOpenedDuringSynchronization) { need2Serialize = true; if (activeEditorBeforeSynchronization != null) { this.activeEditorBeforeSynchronization = activeEditorBeforeSynchronization; @@ -229,38 +231,33 @@ public void appendAsyncAction(AsyncSyncAction asyncSyncAction) { } @Override - public void propertyChange(PropertyChangeEvent event){ + public void propertyChange(PropertyChangeEvent event) { applyPreferences(); } - protected void applyPreferences(){ + protected void applyPreferences() { IPreferenceStore store = UMLPlugin.getDefault().getPreferenceStore(); - getGraphicalViewer().setProperty(SnapToGrid.PROPERTY_GRID_ENABLED, - new Boolean(store.getBoolean(UMLPlugin.PREF_SHOW_GRID))); - getGraphicalViewer().setProperty(SnapToGrid.PROPERTY_GRID_VISIBLE, - new Boolean(store.getBoolean(UMLPlugin.PREF_SHOW_GRID))); + getGraphicalViewer().setProperty(SnapToGrid.PROPERTY_GRID_ENABLED, store.getBoolean(UMLPlugin.PREF_SHOW_GRID)); + getGraphicalViewer().setProperty(SnapToGrid.PROPERTY_GRID_VISIBLE, store.getBoolean(UMLPlugin.PREF_SHOW_GRID)); int gridSize = store.getInt(UMLPlugin.PREF_GRID_SIZE); - getGraphicalViewer().setProperty(SnapToGrid.PROPERTY_GRID_SPACING, - new Dimension(gridSize, gridSize)); + getGraphicalViewer().setProperty(SnapToGrid.PROPERTY_GRID_SPACING, new Dimension(gridSize, gridSize)); getGraphicalViewer().setProperty(SnapToGeometry.PROPERTY_SNAP_ENABLED, - new Boolean(store.getBoolean(UMLPlugin.PREF_SNAP_GEOMETRY))); + store.getBoolean(UMLPlugin.PREF_SNAP_GEOMETRY)); boolean isZoomableWithCtrlAndScroll = store.getBoolean(UMLPlugin.PREF_ZOOMABLE_WITH_CTRL_AND_SCROLL); String mouseWheelHandlerKey = MouseWheelHandler.KeyGenerator.getKey(SWT.CTRL); if (isZoomableWithCtrlAndScroll) { - getGraphicalViewer().setProperty(mouseWheelHandlerKey, - MouseWheelZoomHandler.SINGLETON); + getGraphicalViewer().setProperty(mouseWheelHandlerKey, MouseWheelZoomHandler.SINGLETON); } else { getGraphicalViewer().setProperty(mouseWheelHandlerKey, null); } } /** - * 以前のバージョンで作成されたファイルを自動修正する. - * -v2.0 親子関係の追加 + * 以前のバージョンで作成されたファイルを自動修正する. -v2.0 親子関係の追加 */ private void validateModel(AbstractUMLEntityModel parent) { List children = parent.getChildren(); @@ -277,18 +274,21 @@ private void validateModel(AbstractUMLEntityModel parent) { /** * ロードに失敗した場合の初期モデルを返却する. + * * @return */ protected abstract RootModel createInitializeModel(); /** * エディタのタイプを返却する. (ex class) + * * @return */ protected abstract String getDiagramType(); /** * Diagramモデルを返却する. + * * @return */ public static final RootModel getActiveDiagramModel() { @@ -342,38 +342,34 @@ protected void configureGraphicalViewer() { ScalableRootEditPart rootEditPart = new ScalableRootEditPart(); viewer.setRootEditPart(rootEditPart); - // ZoomManagerの取得 - ZoomManager manager = rootEditPart.getZoomManager(); - - // ズームレベルの設定 - double[] zoomLevels = new double[] { - 0.25,0.5,0.75,1.0,1.5,2.0,2.5,3.0,4.0,5.0,10.0,20.0 - }; - manager.setZoomLevels(zoomLevels); + // ZoomManagerの取得 + ZoomManager manager = rootEditPart.getZoomManager(); - // ズーム レベル コントリビューションの設定 - ArrayList zoomContributions = new ArrayList(); - zoomContributions.add(ZoomManager.FIT_ALL); - zoomContributions.add(ZoomManager.FIT_HEIGHT); - zoomContributions.add(ZoomManager.FIT_WIDTH); - manager.setZoomLevelContributions(zoomContributions); - // 拡大アクションの作成と登録 - getActionRegistry().registerAction(new ZoomInAction(manager)); - // 縮小アクションの作成と登録 - getActionRegistry().registerAction(new ZoomOutAction(manager)); + // ズームレベルの設定 + double[] zoomLevels = new double[] { 0.25, 0.5, 0.75, 1.0, 1.5, 2.0, 2.5, 3.0, 4.0, 5.0, 10.0, 20.0 }; + manager.setZoomLevels(zoomLevels); - getGraphicalViewer().setKeyHandler( - new GraphicalViewerKeyHandler(getGraphicalViewer())); + // ズーム レベル コントリビューションの設定 + ArrayList zoomContributions = new ArrayList(); + zoomContributions.add(ZoomManager.FIT_ALL); + zoomContributions.add(ZoomManager.FIT_HEIGHT); + zoomContributions.add(ZoomManager.FIT_WIDTH); + manager.setZoomLevelContributions(zoomContributions); + // 拡大アクションの作成と登録 + getActionRegistry().registerAction(new ZoomInAction(manager)); + // 縮小アクションの作成と登録 + getActionRegistry().registerAction(new ZoomOutAction(manager)); - // コンテクストメニューの作成 - String menuId = this.getClass().getName() + ".EditorContext"; + getGraphicalViewer().setKeyHandler(new GraphicalViewerKeyHandler(getGraphicalViewer())); + // コンテクストメニューの作成 + String menuId = this.getClass().getName() + ".EditorContext"; MenuManager menuMgr = new MenuManager(menuId, menuId); openPropertyAction = new OpenPropertyViewAction(viewer); - openOutlineAction = new OpenOutlineViewAction(viewer); - saveAsImageAction = new SaveAsImageAction(viewer); - copyAsImageAction = new CopyAsImageAction(viewer); + openOutlineAction = new OpenOutlineViewAction(viewer); + saveAsImageAction = new SaveAsImageAction(viewer); + copyAsImageAction = new CopyAsImageAction(viewer); createDiagramAction(viewer); getSite().registerContextMenu(menuId, menuMgr, viewer); @@ -421,19 +417,20 @@ public void selectionChanged(SelectionChangedEvent event) { menuMgr.add(new Separator("generate")); menuMgr.add(new Separator("additions")); viewer.setContextMenu(menuMgr); - viewer.setKeyHandler(new GraphicalViewerKeyHandler(viewer) - .setParent(getCommonKeyHandler())); + viewer.setKeyHandler(new GraphicalViewerKeyHandler(viewer).setParent(getCommonKeyHandler())); } /** * タイプに特化したアクションを作る. + * * @param viewer */ protected abstract void createDiagramAction(GraphicalViewer viewer); /** * アクションをコンテキストメニューに設定する. + * * @param manager */ protected abstract void fillDiagramPopupMenu(MenuManager manager); @@ -448,16 +445,14 @@ protected void setInput(IEditorInput input) { public void doSave(IProgressMonitor monitor) { try { IEditorInput input = getEditorInput(); - if(input instanceof IFileEditorInput){ + if (input instanceof IFileEditorInput) { needViewerRefreshFlag = false; - IFile file = ((IFileEditorInput)input).getFile(); + IFile file = ((IFileEditorInput) input).getFile(); file.setContents(DiagramSerializer.serialize(getRootModel()), true, true, monitor); } - } - catch(CoreException ex){ + } catch (CoreException ex) { throw new RuntimeException(ex); - } - catch(UnsupportedEncodingException ex){ + } catch (UnsupportedEncodingException ex) { throw new RuntimeException(ex); } getCommandStack().markSaveLocation(); @@ -469,7 +464,7 @@ public void doSaveAs() { } public RootModel getRootModel() { - return (RootModel)getGraphicalViewer().getContents().getModel(); + return (RootModel) getGraphicalViewer().getContents().getModel(); } @Override @@ -478,7 +473,7 @@ public boolean isSaveAsAllowed() { } @Override - public void dispose(){ + public void dispose() { UMLPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(this); ResourcesPlugin.getWorkspace().removeResourceChangeListener(this); super.dispose(); @@ -510,17 +505,13 @@ private boolean savePreviouslyNeeded() { * エンティティ用のPaletteEntryを作成します。 * * @param itemName パレットに表示するアイテム名 - * @param clazz モデルのクラス - * @param icon パレットに表示するアイコンのパス + * @param clazz モデルのクラス + * @param icon パレットに表示するアイコンのパス * @return PaletteEntry */ - protected PaletteEntry createEntityEntry(String itemName,Class clazz,String icon){ - CreationToolEntry entry = new CreationToolEntry( - itemName, - itemName, - new SimpleFactory(clazz), - UMLPlugin.getImageDescriptor(icon), - UMLPlugin.getImageDescriptor(icon)); + protected PaletteEntry createEntityEntry(String itemName, Class clazz, String icon) { + CreationToolEntry entry = new CreationToolEntry(itemName, itemName, new SimpleFactory(clazz), + UMLPlugin.getImageDescriptor(icon), UMLPlugin.getImageDescriptor(icon)); return entry; } @@ -528,71 +519,67 @@ protected PaletteEntry createEntityEntry(String itemName,Class clazz,String i * コネクション用のPaletteEntryを作成します。 * * @param itemName パレットに表示するアイテム名 - * @param clazz モデルのクラス - * @param icon パレットに表示するアイコンのパス + * @param clazz モデルのクラス + * @param icon パレットに表示するアイコンのパス * @return PaletteEntry */ - protected PaletteEntry createConnectionEntry(String itemName,Class clazz,String icon){ - ConnectionCreationToolEntry entry = new ConnectionCreationToolEntry( - itemName, - itemName, - new SimpleFactory(clazz), - UMLPlugin.getImageDescriptor(icon), - UMLPlugin.getImageDescriptor(icon)); + protected PaletteEntry createConnectionEntry(String itemName, Class clazz, String icon) { + ConnectionCreationToolEntry entry = new ConnectionCreationToolEntry(itemName, itemName, + new SimpleFactory(clazz), UMLPlugin.getImageDescriptor(icon), UMLPlugin.getImageDescriptor(icon)); return entry; } @Override public void selectionChanged(IWorkbenchPart part, ISelection selection) { - super.selectionChanged(part,selection); + super.selectionChanged(part, selection); if (selection instanceof IStructuredSelection) { - openPropertyAction.update((IStructuredSelection)selection); - openOutlineAction.update((IStructuredSelection)selection); - saveAsImageAction.update((IStructuredSelection)selection); + openPropertyAction.update((IStructuredSelection) selection); + openOutlineAction.update((IStructuredSelection) selection); + saveAsImageAction.update((IStructuredSelection) selection); updateDiagramAction(selection); } } /** - * Returns the KeyHandler with common bindings for both the Outline and Graphical Views. - * For example, delete is a common action. + * Returns the KeyHandler with common bindings for both the Outline and + * Graphical Views. For example, delete is a common action. */ - protected KeyHandler getCommonKeyHandler(){ - if (sharedKeyHandler == null){ + protected KeyHandler getCommonKeyHandler() { + if (sharedKeyHandler == null) { sharedKeyHandler = new KeyHandler(); - sharedKeyHandler.put( - KeyStroke.getPressed(SWT.F2, 0), - getActionRegistry().getAction(GEFActionConstants.DIRECT_EDIT)); + sharedKeyHandler.put(KeyStroke.getPressed(SWT.F2, 0), + getActionRegistry().getAction(GEFActionConstants.DIRECT_EDIT)); } return sharedKeyHandler; } /** * アクションを更新する. + * * @param selection */ protected abstract void updateDiagramAction(ISelection selection); + @SuppressWarnings("unchecked") @Override - public Object getAdapter(@SuppressWarnings("rawtypes") Class type) { - if (type == ZoomManager.class){ - return ((ScalableRootEditPart) getGraphicalViewer().getRootEditPart()).getZoomManager(); + public T getAdapter(Class type) { + if (type == ZoomManager.class) { + return (T) ((ScalableRootEditPart) getGraphicalViewer().getRootEditPart()).getZoomManager(); } if (type == IContentOutlinePage.class) { - return new UMLContentOutlinePage(); + return (T) new UMLContentOutlinePage(); } - if (type == RootModel.class){ - return getGraphicalViewer().getContents().getModel(); + if (type == RootModel.class) { + return (T) getGraphicalViewer().getContents().getModel(); } if (type == CommandStack.class) { - return getCommandStack(); + return (T) getCommandStack(); } return super.getAdapter(type); } /** - * UMLエディタのアウトラインページ。 - * ダイアグラムのサムネイルを表示します。 + * UMLエディタのアウトラインページ。 ダイアグラムのサムネイルを表示します。 */ private class UMLContentOutlinePage implements IContentOutlinePage { @@ -606,8 +593,8 @@ public void createControl(Composite parent) { LightweightSystem lws = new LightweightSystem(canvas); // RootEditPartのビューをソースとしてサムネイルを作成 - ScalableRootEditPart rootEditPart = (ScalableRootEditPart)getGraphicalViewer().getRootEditPart(); - this.thumbnail = new ScrollableThumbnail((Viewport)rootEditPart.getFigure()); + ScalableRootEditPart rootEditPart = (ScalableRootEditPart) getGraphicalViewer().getRootEditPart(); + this.thumbnail = new ScrollableThumbnail((Viewport) rootEditPart.getFigure()); this.thumbnail.setSource(rootEditPart.getLayer(LayerConstants.PRINTABLE_LAYERS)); lws.setContents(thumbnail); @@ -626,13 +613,13 @@ public void widgetDisposed(DisposeEvent e) { } @Override - public Control getControl(){ + public Control getControl() { return this.canvas; } @Override public void dispose() { - if (getGraphicalViewer().getControl() != null && !getGraphicalViewer().getControl().isDisposed()){ + if (getGraphicalViewer().getControl() != null && !getGraphicalViewer().getControl().isDisposed()) { getGraphicalViewer().getControl().removeDisposeListener(disposeListener); } } @@ -669,5 +656,4 @@ public void setSelection(ISelection selection) { } } - } diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/UMLImageRegistry.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/UMLImageRegistry.java index d637125..9317356 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/UMLImageRegistry.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/UMLImageRegistry.java @@ -4,7 +4,8 @@ package net.java.amateras.uml; import java.net.MalformedURLException; -import java.net.URL; +import java.net.URI; +import java.net.URISyntaxException; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; @@ -36,11 +37,13 @@ public static Image getImage(String url) { private Image createImage(String url) { try { - ImageDescriptor descriptor = ImageDescriptor.createFromURL(new URL(url)); + ImageDescriptor descriptor = ImageDescriptor.createFromURL(new URI(url).toURL()); if (registry.get(url) == null) { registry.put(url, descriptor); } return registry.get(url); + } catch (URISyntaxException e) { + e.printStackTrace(); } catch (MalformedURLException e) { e.printStackTrace(); } diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/UMLPlugin.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/UMLPlugin.java index 8611404..8cf7369 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/UMLPlugin.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/UMLPlugin.java @@ -1,7 +1,5 @@ package net.java.amateras.uml; -import java.util.ArrayList; -import java.util.List; import java.util.MissingResourceException; import java.util.ResourceBundle; @@ -68,7 +66,7 @@ public class UMLPlugin extends AbstractUIPlugin { */ public static final String PREF_SEQUENCE_DIAGRAM_SHOW_SIMPLE_NAME = "pref.sequence.simplename"; - private List dndListeners = new ArrayList(); +// private List dndListeners = new ArrayList(); /** * The constructor. @@ -172,7 +170,7 @@ public static void logException(Throwable ex) { // return type; // } - public List getDndListeners() { - return dndListeners; - } +// public List getDndListeners() { +// return dndListeners; +// } } diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/activitydiagram/editpart/VerticalPartitionEditPart.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/activitydiagram/editpart/VerticalPartitionEditPart.java index 3d3476e..d64c927 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/activitydiagram/editpart/VerticalPartitionEditPart.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/activitydiagram/editpart/VerticalPartitionEditPart.java @@ -1,8 +1,5 @@ package net.java.amateras.uml.activitydiagram.editpart; -import java.util.Collections; -import java.util.List; - import net.java.amateras.uml.activitydiagram.figure.ActivityFigureFactory; import net.java.amateras.uml.activitydiagram.figure.VerticalPartitionFigure; import net.java.amateras.uml.activitydiagram.model.VerticalPartitionModel; @@ -42,10 +39,6 @@ protected void createEditPolicies() { removeEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE); } - protected List getModelChildren() { - return Collections.EMPTY_LIST; - } - /** エディットポリシー */ private class RootEditPolicy extends XYLayoutEditPolicy { diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/activitydiagram/figure/ext/ActionFigureEx.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/activitydiagram/figure/ext/ActionFigureEx.java index c7b1788..f9b5a20 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/activitydiagram/figure/ext/ActionFigureEx.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/activitydiagram/figure/ext/ActionFigureEx.java @@ -7,6 +7,7 @@ import org.eclipse.draw2d.ColorConstants; import org.eclipse.draw2d.Graphics; +import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.swt.graphics.Color; @@ -26,6 +27,7 @@ public ActionFigureEx() { public void paintFigure(Graphics graphics) { graphics.setBackgroundColor(ColorConstants.lightGray); Rectangle copy = getBounds().getCopy(); + Dimension corner = getCornerDimensions(); copy = copy.shrink(3, 3); copy = copy.translate(3, 3); graphics.fillRoundRectangle(copy, corner.width, corner.height); diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/activitydiagram/model/ActivityModel.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/activitydiagram/model/ActivityModel.java index c6e597c..e10b927 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/activitydiagram/model/ActivityModel.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/activitydiagram/model/ActivityModel.java @@ -15,7 +15,7 @@ public class ActivityModel extends RootModel { public void addChild(AbstractUMLModel model) { - List children = getChildren(); + List children = getChildren(); model.setParent(this); if(model instanceof VerticalPartitionModel){ children.add(0, model); diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/action/AutoLayoutAction.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/action/AutoLayoutAction.java index 396cb1c..817041d 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/action/AutoLayoutAction.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/action/AutoLayoutAction.java @@ -42,7 +42,7 @@ public void update(IStructuredSelection sel) { // Do nothing } - @SuppressWarnings({"rawtypes", "unchecked"}) + @SuppressWarnings("rawtypes") public void run() { CompoundCommand commands = new CompoundCommand(); List models = getViewer().getContents().getChildren(); @@ -89,7 +89,7 @@ public void run() { graph.edges = graphEdges; new DirectedGraphLayout().visit(graph); for (int i = 0; i < graph.nodes.size(); i++) { - EntityNode node = (EntityNode) graph.nodes.getNode(i); + EntityNode node = (EntityNode) graph.nodes.get(i); commands.add(new LayoutCommand(node.model, node.x, node.y)); } diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/action/ShowPublicAction.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/action/ShowPublicAction.java index 6f33ac0..b1828cb 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/action/ShowPublicAction.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/action/ShowPublicAction.java @@ -68,12 +68,12 @@ public ShowPublicCommand(AbstractUMLEntityModel target){ public void execute() { oldValue = target.getFilterProperty(); Map newValue = new HashMap(); - newValue.put(ToggleAction.ATTRIBUTE + Visibility.PROTECTED, new Boolean(true)); - newValue.put(ToggleAction.ATTRIBUTE + Visibility.PACKAGE, new Boolean(true)); - newValue.put(ToggleAction.ATTRIBUTE + Visibility.PRIVATE, new Boolean(true)); - newValue.put(ToggleAction.OPERATION + Visibility.PROTECTED, new Boolean(true)); - newValue.put(ToggleAction.OPERATION + Visibility.PACKAGE, new Boolean(true)); - newValue.put(ToggleAction.OPERATION + Visibility.PRIVATE, new Boolean(true)); + newValue.put(ToggleAction.ATTRIBUTE + Visibility.PROTECTED, true); + newValue.put(ToggleAction.ATTRIBUTE + Visibility.PACKAGE, true); + newValue.put(ToggleAction.ATTRIBUTE + Visibility.PRIVATE, true); + newValue.put(ToggleAction.OPERATION + Visibility.PROTECTED, true); + newValue.put(ToggleAction.OPERATION + Visibility.PACKAGE, true); + newValue.put(ToggleAction.OPERATION + Visibility.PRIVATE, true); target.setFilterProperty(newValue); } diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/action/ToggleAction.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/action/ToggleAction.java index fd983fb..1a0868d 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/action/ToggleAction.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/action/ToggleAction.java @@ -109,18 +109,18 @@ public void execute() { Map map = target.getFilterProperty(); if (!map.containsKey(type + visibility)) { oldValue = false; - map.put(type + visibility, new Boolean(true)); + map.put(type + visibility, true); } else { Boolean value = (Boolean) map.get(type + visibility); oldValue = value.booleanValue(); - map.put(type + visibility, new Boolean(!value.booleanValue())); + map.put(type + visibility, !value.booleanValue()); } target.setFilterProperty(map); } public void undo() { Map map = target.getFilterProperty(); - map.put(type + visibility, new Boolean(oldValue)); + map.put(type + visibility, oldValue); target.setFilterProperty(map); } } diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/editpart/CommonEntityEditPart.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/editpart/CommonEntityEditPart.java index b1a44df..b64ace0 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/editpart/CommonEntityEditPart.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/editpart/CommonEntityEditPart.java @@ -59,7 +59,6 @@ public void propertyChange(PropertyChangeEvent evt) { } else if (evt.getPropertyName().equals(CommonEntityModel.P_CHILDREN)) { refreshChildren(); } else if (evt.getPropertyName().equals(CommonEntityModel.P_FILTER)) { - @SuppressWarnings("unchecked") List list = new ArrayList(getChildren()); for (Iterator iter = list.iterator(); iter.hasNext();) { EditPart element = iter.next(); diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/model/AttributeModel.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/model/AttributeModel.java index 8798aa2..d0c2249 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/model/AttributeModel.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/model/AttributeModel.java @@ -74,7 +74,7 @@ public void setStatic(boolean isStatic) { else { this.isStatic = isStatic; } - firePropertyChange(P_STATIC,null,new Boolean(this.isStatic)); + firePropertyChange(P_STATIC, null, this.isStatic); } public boolean isFinal() { @@ -88,7 +88,7 @@ public void setFinal(boolean isFinal) { else { this.isFinal = isFinal; } - firePropertyChange(P_FINAL,null,new Boolean(this.isFinal)); + firePropertyChange(P_FINAL, null, this.isFinal); } public boolean isEnumCst() { @@ -132,9 +132,9 @@ public Object getPropertyValue(Object id) { } else if(id.equals(P_VISIBILITY)){ return getVisibility(); } else if(id.equals(P_STATIC)){ - return new Boolean(isStatic()); + return isStatic(); } else if(id.equals(P_FINAL)){ - return new Boolean(isFinal()); + return isFinal(); } return null; } diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/model/ClassModel.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/model/ClassModel.java index a839afb..b99ab62 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/model/ClassModel.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/model/ClassModel.java @@ -56,13 +56,13 @@ public boolean isAbstract() { public void setAbstract(boolean isAbstract) { this.isAbstract = isAbstract; - firePropertyChange(P_ABSTRACT, null, new Boolean(isAbstract)); + firePropertyChange(P_ABSTRACT, null, isAbstract); } @Override public Object getPropertyValue(Object id) { if (id.equals(P_ABSTRACT)) { - return new Boolean(isAbstract()); + return isAbstract(); } return super.getPropertyValue(id); } diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/model/OperationModel.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/model/OperationModel.java index 28b3fe3..774238e 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/model/OperationModel.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/classdiagram/model/OperationModel.java @@ -37,21 +37,20 @@ public class OperationModel extends AbstractUMLModel implements Cloneable { public static final String P_STATIC = "_static"; public static final String P_FINAL = "_final"; - public boolean isConstructor(){ - if(getType().length() == 0 || getType().equals("void")){ + public boolean isConstructor() { + if (getType().length() == 0 || getType().equals("void")) { AbstractUMLEntityModel parent = getParent(); - if(parent != null && parent instanceof ClassModel){ + if (parent != null && parent instanceof ClassModel) { String className = ((ClassModel) parent).getName(); int index = className.lastIndexOf('.'); - if(index >= 0){ + if (index >= 0) { className = className.substring(index + 1); } return className.equals(getName()); - } - else if (parent != null && parent instanceof EnumModel) { + } else if (parent != null && parent instanceof EnumModel) { String className = ((EnumModel) parent).getName(); int index = className.lastIndexOf('.'); - if(index >= 0){ + if (index >= 0) { className = className.substring(index + 1); } return className.equals(getName()); @@ -66,7 +65,7 @@ public boolean isAbstract() { public void setAbstract(boolean isAbstract) { this.isAbstract = isAbstract; - firePropertyChange(P_ABSTRACT,null,new Boolean(isAbstract)); + firePropertyChange(P_ABSTRACT, null, isAbstract); } public boolean isStatic() { @@ -75,16 +74,16 @@ public boolean isStatic() { public void setStatic(boolean isStatic) { this.isStatic = isStatic; - firePropertyChange(P_STATIC,null,new Boolean(isStatic)); + firePropertyChange(P_STATIC, null, isStatic); } - + public boolean isFinal() { return isFinal; } - + public void setFinal(boolean isFinal) { this.isFinal = isFinal; - firePropertyChange(P_FINAL,null,new Boolean(isFinal)); + firePropertyChange(P_FINAL, null, isFinal); } public String getName() { @@ -93,7 +92,7 @@ public String getName() { public void setName(String name) { this.name = name; - firePropertyChange(P_NAME,null,name); + firePropertyChange(P_NAME, null, name); } public List getParams() { @@ -102,7 +101,7 @@ public List getParams() { public void setParams(List params) { this.params = params; - firePropertyChange(P_PARAMS,null,params); + firePropertyChange(P_PARAMS, null, params); } public String getType() { @@ -111,7 +110,7 @@ public String getType() { public void setType(String type) { this.type = type; - firePropertyChange(P_TYPE,null,type); + firePropertyChange(P_TYPE, null, type); } public Visibility getVisibility() { @@ -120,106 +119,99 @@ public Visibility getVisibility() { public void setVisibility(Visibility visibility) { this.visibility = visibility; - firePropertyChange(P_VISIBILITY,null,visibility); + firePropertyChange(P_VISIBILITY, null, visibility); if (getParent() != null) { getParent().forceUpdate(); } } public IPropertyDescriptor[] getPropertyDescriptors() { - return new IPropertyDescriptor[]{ - new TextPropertyDescriptor(P_NAME, - UMLPlugin.getDefault().getResourceString("property.name")), - new TextPropertyDescriptor(P_TYPE, - UMLPlugin.getDefault().getResourceString("property.type")), + return new IPropertyDescriptor[] { + new TextPropertyDescriptor(P_NAME, UMLPlugin.getDefault().getResourceString("property.name")), + new TextPropertyDescriptor(P_TYPE, UMLPlugin.getDefault().getResourceString("property.type")), new EnumPropertyDescriptor(P_VISIBILITY, - UMLPlugin.getDefault().getResourceString("property.visibility"), - Visibility.getVisibilities()), + UMLPlugin.getDefault().getResourceString("property.visibility"), Visibility.getVisibilities()), new ArgumentsPropertyDescriptor(P_PARAMS, UMLPlugin.getDefault().getResourceString("property.arguments")), - new BooleanPropertyDescriptor(P_STATIC, - UMLPlugin.getDefault().getResourceString("property.static")), - new BooleanPropertyDescriptor(P_FINAL, - UMLPlugin.getDefault().getResourceString("property.final")), + new BooleanPropertyDescriptor(P_STATIC, UMLPlugin.getDefault().getResourceString("property.static")), + new BooleanPropertyDescriptor(P_FINAL, UMLPlugin.getDefault().getResourceString("property.final")), new BooleanPropertyDescriptor(P_ABSTRACT, UMLPlugin.getDefault().getResourceString("property.abstract")), - new ColorPropertyDescriptor(P_FOREGROUND_COLOR, UMLPlugin - .getDefault().getResourceString("property.foreground")) - }; + new ColorPropertyDescriptor(P_FOREGROUND_COLOR, + UMLPlugin.getDefault().getResourceString("property.foreground")) }; } public Object getPropertyValue(Object id) { - if(id.equals(P_NAME)){ + if (id.equals(P_NAME)) { return getName(); - } else if(id.equals(P_TYPE)){ + } else if (id.equals(P_TYPE)) { return getType(); - } else if(id.equals(P_VISIBILITY)){ + } else if (id.equals(P_VISIBILITY)) { return getVisibility(); - } else if(id.equals(P_PARAMS)){ + } else if (id.equals(P_PARAMS)) { return getParams(); - } else if(id.equals(P_STATIC)){ - return new Boolean(isStatic()); - } else if(id.equals(P_FINAL)){ - return new Boolean(isFinal()); - } else if(id.equals(P_ABSTRACT)){ - return new Boolean(isAbstract()); + } else if (id.equals(P_STATIC)) { + return isStatic(); + } else if (id.equals(P_FINAL)) { + return isFinal(); + } else if (id.equals(P_ABSTRACT)) { + return isAbstract(); } return super.getPropertyValue(id); } public boolean isPropertySet(Object id) { - if(id.equals(P_NAME)){ + if (id.equals(P_NAME)) { return true; - } else if(id.equals(P_TYPE)){ + } else if (id.equals(P_TYPE)) { return true; - } else if(id.equals(P_VISIBILITY)){ + } else if (id.equals(P_VISIBILITY)) { return true; - } else if(id.equals(P_PARAMS)){ + } else if (id.equals(P_PARAMS)) { return true; - } else if(id.equals(P_STATIC)){ + } else if (id.equals(P_STATIC)) { return true; - } else if(id.equals(P_FINAL)){ + } else if (id.equals(P_FINAL)) { return true; - } else if(id.equals(P_ABSTRACT)){ + } else if (id.equals(P_ABSTRACT)) { return true; } return super.isPropertySet(id); } - @SuppressWarnings({"rawtypes", "unchecked"}) + @SuppressWarnings({ "rawtypes", "unchecked" }) public void setPropertyValue(Object id, Object value) { - if(id.equals(P_NAME)){ - setName((String)value); - } else if(id.equals(P_TYPE)){ - setType((String)value); - } else if(id.equals(P_VISIBILITY)){ - setVisibility((Visibility)value); - } else if(id.equals(P_PARAMS)){ + if (id.equals(P_NAME)) { + setName((String) value); + } else if (id.equals(P_TYPE)) { + setType((String) value); + } else if (id.equals(P_VISIBILITY)) { + setVisibility((Visibility) value); + } else if (id.equals(P_PARAMS)) { setParams((List) value); - } else if(id.equals(P_STATIC)){ - setStatic(((Boolean)value).booleanValue()); - } else if(id.equals(P_FINAL)){ - setFinal(((Boolean)value).booleanValue()); - } else if(id.equals(P_ABSTRACT)){ - setAbstract(((Boolean)value).booleanValue()); + } else if (id.equals(P_STATIC)) { + setStatic(((Boolean) value).booleanValue()); + } else if (id.equals(P_FINAL)) { + setFinal(((Boolean) value).booleanValue()); + } else if (id.equals(P_ABSTRACT)) { + setAbstract(((Boolean) value).booleanValue()); } super.setPropertyValue(id, value); } - - public String toString(){ + public String toString() { StringBuffer sb = new StringBuffer(); sb.append(getName()); sb.append("("); - for(int i=0;i args = getParams(); List newArgs = new ArrayList(); - for(int i=0;i> RESIZABLE = null; { - RESIZABLE = new HashSet(); + RESIZABLE = new HashSet>(); RESIZABLE.add(NoteModel.class); } - protected void addResizableClass(Class c) { + + protected void addResizableClass(Class c) { RESIZABLE.add(c); } - + protected IFigure createFigure() { Layer figure = new Layer() { public void paint(Graphics graphics) { @@ -57,7 +59,7 @@ public void paint(Graphics graphics) { } }; figure.setLayoutManager(new XYLayout()); - + ConnectionLayer layer = (ConnectionLayer) getLayer(LayerConstants.CONNECTION_LAYER); // if ("manhattan".equals(UMLPlugin.getDefault().getConnectionRouter())) { // layer.setConnectionRouter(new ManhattanConnectionRouter()); @@ -69,17 +71,17 @@ public void paint(Graphics graphics) { // ShortestPathConnectionRouter router = new ShortestPathConnectionRouter(figure); // layer.setConnectionRouter(router); // } else { - layer.setConnectionRouter(ConnectionRouter.NULL); + layer.setConnectionRouter(ConnectionRouter.NULL); // } return figure; } - + protected void createEditPolicies() { installEditPolicy(EditPolicy.LAYOUT_ROLE, new RootEditPolicy()); } - - protected List getModelChildren() { - return ((RootModel)getModel()).getChildren(); + + protected List getModelChildren() { + return ((RootModel) getModel()).getChildren(); // ArrayList models = new ArrayList(); // for(int i=0;i T getAdapter(Class adapter) { if (adapter == SnapToHelper.class) { - List snapStrategies = new ArrayList(); - Boolean val = (Boolean)getViewer().getProperty(RulerProvider.PROPERTY_RULER_VISIBILITY); + List snapStrategies = new ArrayList(); + Boolean val = (Boolean) getViewer().getProperty(RulerProvider.PROPERTY_RULER_VISIBILITY); if (val != null && val.booleanValue()) snapStrategies.add(new SnapToGuides(this)); - val = (Boolean)getViewer().getProperty(SnapToGeometry.PROPERTY_SNAP_ENABLED); + val = (Boolean) getViewer().getProperty(SnapToGeometry.PROPERTY_SNAP_ENABLED); if (val != null && val.booleanValue()) snapStrategies.add(new SnapToGeometry(this)); - val = (Boolean)getViewer().getProperty(SnapToGrid.PROPERTY_GRID_ENABLED); + val = (Boolean) getViewer().getProperty(SnapToGrid.PROPERTY_GRID_ENABLED); if (val != null && val.booleanValue()) snapStrategies.add(new SnapToGrid(this)); - + if (snapStrategies.size() == 0) return null; if (snapStrategies.size() == 1) - return (SnapToHelper)snapStrategies.get(0); + return (T) (SnapToHelper) snapStrategies.get(0); SnapToHelper ss[] = new SnapToHelper[snapStrategies.size()]; for (int i = 0; i < snapStrategies.size(); i++) - ss[i] = (SnapToHelper)snapStrategies.get(i); - return new CompoundSnapToHelper(ss); + ss[i] = (SnapToHelper) snapStrategies.get(i); + return (T) new CompoundSnapToHelper(ss); } return super.getAdapter(adapter); } diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/model/AbstractUMLModel.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/model/AbstractUMLModel.java index 57114dc..eac7f3a 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/model/AbstractUMLModel.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/model/AbstractUMLModel.java @@ -82,7 +82,7 @@ public Object getPropertyValue(Object id) { } else if (P_FOREGROUND_COLOR.equals(id)) { return foregroundColor; } else if (P_SHOW_ICON.equals(id)) { - return new Boolean(isShowIcon()); + return isShowIcon(); } return null; } @@ -132,7 +132,7 @@ public boolean isShowIcon() { public void setShowIcon(boolean showIcon) { this.showIcon = showIcon; - firePropertyChange(P_SHOW_ICON, null, new Boolean(showIcon)); + firePropertyChange(P_SHOW_ICON, null, showIcon); } public void copyPresentation(AbstractUMLModel model) { diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/properties/BooleanPropertyDescriptor.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/properties/BooleanPropertyDescriptor.java index 6ff483b..2e48fe1 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/properties/BooleanPropertyDescriptor.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/properties/BooleanPropertyDescriptor.java @@ -12,37 +12,35 @@ * @author Naoki Takezoe */ public class BooleanPropertyDescriptor extends PropertyDescriptor { - - public BooleanPropertyDescriptor(Object id,String displayName){ - super(id,displayName); + + public BooleanPropertyDescriptor(Object id, String displayName) { + super(id, displayName); } - - public CellEditor createPropertyEditor(Composite parent) { - CellEditor editor = new ComboBoxCellEditor( - parent, new String[]{"true","false"},SWT.READ_ONLY){ - public void doSetValue(Object value){ - if(((Boolean)value).booleanValue()){ - super.doSetValue(new Integer(0)); - } else { - super.doSetValue(new Integer(1)); - } - } - public Object doGetValue(){ - int selection = ((Integer)super.doGetValue()).intValue(); - if(selection==0){ - return new Boolean(true); - } else { - return new Boolean(false); - } - } - }; - - if (getValidator() != null) - editor.setValidator(getValidator()); - - return editor; - } - - - + + public CellEditor createPropertyEditor(Composite parent) { + CellEditor editor = new ComboBoxCellEditor(parent, new String[] { "true", "false" }, SWT.READ_ONLY) { + public void doSetValue(Object value) { + if (((Boolean) value).booleanValue()) { + super.doSetValue(0); + } else { + super.doSetValue(1); + } + } + + public Object doGetValue() { + int selection = ((Integer) super.doGetValue()).intValue(); + if (selection == 0) { + return true; + } else { + return false; + } + } + }; + + if (getValidator() != null) + editor.setValidator(getValidator()); + + return editor; + } + } diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/InstanceModel.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/InstanceModel.java index 4598f8f..b31894e 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/InstanceModel.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/InstanceModel.java @@ -7,6 +7,7 @@ import java.util.List; import net.java.amateras.uml.UMLPlugin; +import net.java.amateras.uml.model.AbstractUMLConnectionModel; import net.java.amateras.uml.model.EntityModel; import net.java.amateras.uml.model.TypeEntityModel; import net.java.amateras.uml.sequencediagram.property.TypePropertyDescriptor; @@ -107,8 +108,8 @@ public void setCreator(SyncMessageModel creator) { public void setConstraint(Rectangle constraint) { Rectangle old = getConstraint(); if (old != null) { - List connections = getModelTargetConnections(); - for (Iterator iter = connections.iterator(); iter.hasNext();) { + List connections = getModelTargetConnections(); + for (Iterator iter = connections.iterator(); iter.hasNext();) { SyncMessageModel element = (SyncMessageModel) iter.next(); if (element.getSource().getConstraint().y > constraint.y) { constraint.y = element.getSource().getConstraint().y; @@ -128,8 +129,8 @@ public void setConstraint(Rectangle constraint) { } super.setConstraint(constraint); - List connections = getModelTargetConnections(); - for (Iterator iter = connections.iterator(); iter.hasNext();) { + List connections = getModelTargetConnections(); + for (Iteratoriter = connections.iterator(); iter.hasNext();) { SyncMessageModel element = (SyncMessageModel) iter.next(); element.updateCaller(getConstraint().y + getConstraint().height + 20); diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/InteractionModel.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/InteractionModel.java index 0f73769..72c3cb3 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/InteractionModel.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/InteractionModel.java @@ -28,13 +28,13 @@ public class InteractionModel extends RootModel { public static final String P_LIFELINE = "_children_lifeline"; - private List instances = new ArrayList(); + private List instances = new ArrayList(); - private List activations = new ArrayList(); + private List activations = new ArrayList(); - private List fragments = new ArrayList(); + private List fragments = new ArrayList(); - private List lifelines = new ArrayList(); + private List lifelines = new ArrayList(); public void addInstance(InstanceModel child){ child.setRoot(this); @@ -43,7 +43,7 @@ public void addInstance(InstanceModel child){ firePropertyChange(P_INSTANCE,null,child); } - public List getInstances(){ + public List getInstances(){ return instances; } @@ -60,7 +60,7 @@ public void addActivation(ActivationModel child){ firePropertyChange(P_ACTIVATION,null,child); } - public List getActivations(){ + public List getActivations(){ return activations; } @@ -68,7 +68,7 @@ public void removeActivation(ActivationModel obj){ activations.remove(obj); removeChild(obj); firePropertyChange(P_ACTIVATION, obj, null); - for (Iterator iter = obj.getChildren().iterator(); iter.hasNext();) { + for (Iterator iter = obj.getChildren().iterator(); iter.hasNext();) { ActivationModel element = (ActivationModel) iter.next(); removeActivation(element); } @@ -82,7 +82,7 @@ public void addFragment(FragmentModel child){ firePropertyChange(P_FRAGMENT,null,child); } - public List getFragments(){ + public List getFragments(){ return fragments; } @@ -99,7 +99,7 @@ public void addLifeLine(LifeLineModel child){ adjustLifeLine(); } - public List getLifeLines(){ + public List getLifeLines(){ return lifelines; } @@ -107,7 +107,7 @@ public void removeLifeLine(LifeLineModel obj){ removeChild(obj); lifelines.remove(obj); firePropertyChange(P_LIFELINE, obj, null); - for (Iterator iter = obj.getChildren().iterator(); iter.hasNext();) { + for (Iterator iter = obj.getChildren().iterator(); iter.hasNext();) { ActivationModel element = (ActivationModel) iter.next(); removeActivation(element); } @@ -136,9 +136,9 @@ public void removeUMLModel(AbstractUMLModel model) { public void adjustLifeLine() { int max =LifeLineModel.DEFAULT_HEIGHT + InstanceModel.DEFAULT_LOCATION; - for (Iterator iter = lifelines.iterator(); iter.hasNext();) { + for (Iterator iter = lifelines.iterator(); iter.hasNext();) { LifeLineModel element = (LifeLineModel) iter.next(); - for (Iterator iterator = element.getChildren().iterator(); iterator.hasNext();) { + for (Iterator iterator = element.getChildren().iterator(); iterator.hasNext();) { ActivationModel a = (ActivationModel) iterator.next(); int current = a.getConstraint().y + a.getConstraint().height + 30; if (current > max) { @@ -147,7 +147,7 @@ public void adjustLifeLine() { } } - for (Iterator iter = lifelines.iterator(); iter.hasNext();) { + for (Iterator iter = lifelines.iterator(); iter.hasNext();) { LifeLineModel element = (LifeLineModel) iter.next(); Rectangle rectangle = element.getConstraint(); rectangle.height = max - rectangle.y; @@ -155,12 +155,12 @@ public void adjustLifeLine() { } } - public List getNotes() { - List rv = new ArrayList(); - for (Iterator iter = getChildren().iterator(); iter.hasNext();) { + public List getNotes() { + List rv = new ArrayList(); + for (Iterator iter = getChildren().iterator(); iter.hasNext();) { Object element = (Object) iter.next(); if (element instanceof NoteModel) { - rv.add(element); + rv.add((NoteModel) element); } } return rv; diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/LifeLineModel.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/LifeLineModel.java index 5e98e9d..30716a4 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/LifeLineModel.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/LifeLineModel.java @@ -6,6 +6,7 @@ import java.util.Iterator; import net.java.amateras.uml.model.AbstractUMLEntityModel; +import net.java.amateras.uml.model.AbstractUMLModel; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.ui.views.properties.IPropertyDescriptor; @@ -55,7 +56,7 @@ public void adjustLocation(Rectangle delta) { setConstraint(rectangle); } delta.y = 0; - for (Iterator iter = getChildren().iterator(); iter.hasNext();) { + for (Iterator iter = getChildren().iterator(); iter.hasNext();) { ActivationModel element = (ActivationModel) iter.next(); element.adjustLocation(delta); } @@ -74,7 +75,7 @@ public void computeSize() { Rectangle rectangle = getConstraint(); if (rectangle != null) { int max = 0; - for (Iterator iter = getChildren().iterator(); iter.hasNext();) { + for (Iterator iter = getChildren().iterator(); iter.hasNext();) { ActivationModel element = (ActivationModel) iter.next(); int cmax = element.getConstraint().y + element.getConstraint().height; if (max < cmax) { diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/MessageModel.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/MessageModel.java index 4133d0c..c90fd39 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/MessageModel.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/MessageModel.java @@ -9,6 +9,7 @@ import net.java.amateras.uml.UMLPlugin; import net.java.amateras.uml.model.AbstractUMLConnectionModel; import net.java.amateras.uml.model.AbstractUMLEntityModel; +import net.java.amateras.uml.model.AbstractUMLModel; import net.java.amateras.uml.model.EntityModel; import net.java.amateras.uml.sequencediagram.property.MessagePropertyDescriptor; @@ -19,8 +20,7 @@ * @author Takahiro Shida. * */ -public class MessageModel extends AbstractUMLConnectionModel implements - EntityModel { +public class MessageModel extends AbstractUMLConnectionModel implements EntityModel { public static final String P_NAME = "_instance_name"; @@ -50,24 +50,21 @@ private EntityModel getType() { return null; } - public List getProporsal() { + public List getProporsal() { EntityModel model = getType(); if (model instanceof AbstractUMLEntityModel) { AbstractUMLEntityModel entityModel = (AbstractUMLEntityModel) model; return entityModel.getChildren(); } - return Collections.EMPTY_LIST; + return Collections.emptyList(); } public IPropertyDescriptor[] getPropertyDescriptors() { - MessagePropertyDescriptor descriptor = new MessagePropertyDescriptor( - P_NAME, UMLPlugin.getDefault().getResourceString( - "property.name")); + MessagePropertyDescriptor descriptor = new MessagePropertyDescriptor(P_NAME, + UMLPlugin.getDefault().getResourceString("property.name")); descriptor.setUMLModels(getProporsal()); - return new IPropertyDescriptor[] { descriptor, - new ColorPropertyDescriptor( - P_FOREGROUND_COLOR, UMLPlugin.getDefault().getResourceString( - "property.foreground")) }; + return new IPropertyDescriptor[] { descriptor, new ColorPropertyDescriptor(P_FOREGROUND_COLOR, + UMLPlugin.getDefault().getResourceString("property.foreground")) }; } public Object getPropertyValue(Object id) { @@ -97,8 +94,7 @@ public void attachTarget() { public void calcDirection() { if (getSource() != null && getTarget() != null) - setDirection(getSource().getConstraint().x < getTarget() - .getConstraint().x); + setDirection(getSource().getConstraint().x < getTarget().getConstraint().x); } public boolean isDirection() { @@ -107,6 +103,6 @@ public boolean isDirection() { public void setDirection(boolean direction) { this.direction = direction; - firePropertyChange(P_DIRECTION, null, new Boolean(direction)); + firePropertyChange(P_DIRECTION, null, direction); } } diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/MessageOrderUtil.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/MessageOrderUtil.java index 9194803..57cbfa8 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/MessageOrderUtil.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/MessageOrderUtil.java @@ -9,6 +9,8 @@ import java.util.Iterator; import java.util.List; +import net.java.amateras.uml.model.AbstractUMLConnectionModel; + /** * @author Takahiro Shida. * @@ -16,18 +18,18 @@ public class MessageOrderUtil { public static void computeMessageOrders(InteractionModel model) { - List activations = model.getActivations(); - List messages = new ArrayList(); - for (Iterator iter = activations.iterator(); iter.hasNext();) { - ActivationModel element = (ActivationModel) iter.next(); + List activations = model.getActivations(); + List messages = new ArrayList(); + for (Iterator iter = activations.iterator(); iter.hasNext();) { + ActivationModel element = iter.next(); messages.addAll(element.getSyncSourceConnection()); } Collections.sort(messages, new MessageOrderComparator()); int index = 1; - for (Iterator iter = messages.iterator(); iter.hasNext();) { - SyncMessageModel element = (SyncMessageModel) iter.next(); + for (Iterator iter = messages.iterator(); iter.hasNext();) { + SyncMessageModel element = iter.next(); element.setOrder(index); index++; } @@ -36,23 +38,23 @@ public static void computeMessageOrders(InteractionModel model) { } private static void computeMessageDirection(InteractionModel model) { - List activations = model.getActivations(); - List messages = new ArrayList(); - for (Iterator iter = activations.iterator(); iter.hasNext();) { - ActivationModel element = (ActivationModel) iter.next(); + List activations = model.getActivations(); + List messages = new ArrayList(); + for (Iterator iter = activations.iterator(); iter.hasNext();) { + ActivationModel element = iter.next(); messages.addAll(element.getModelSourceConnections()); } - for (Iterator iter = messages.iterator(); iter.hasNext();) { + for (Iterator iter = messages.iterator(); iter.hasNext();) { MessageModel element = (MessageModel) iter.next(); element.calcDirection(); } } - static class MessageOrderComparator implements Comparator { + static class MessageOrderComparator implements Comparator { - public int compare(Object arg0, Object arg1) { - SyncMessageModel msgSource = (SyncMessageModel) arg0; - SyncMessageModel msgTarget = (SyncMessageModel) arg1; + public int compare(SyncMessageModel arg0, SyncMessageModel arg1) { + SyncMessageModel msgSource = arg0; + SyncMessageModel msgTarget = arg1; int source = msgSource.getTarget().getConstraint().y; int target = msgTarget.getTarget().getConstraint().y; if (source == target) { diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/SequenceModelBuilder.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/SequenceModelBuilder.java index 1986a6f..9f878d9 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/SequenceModelBuilder.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/SequenceModelBuilder.java @@ -9,6 +9,7 @@ import java.util.Map; import java.util.Stack; +import net.java.amateras.uml.model.AbstractUMLModel; import net.java.amateras.xstream.XStreamSerializer; import org.eclipse.draw2d.geometry.Dimension; @@ -22,27 +23,26 @@ public class SequenceModelBuilder { private InteractionModel root = new InteractionModel(); - + private ActivationModel current; - private Stack messageStack = new Stack(); - - private Map messageMap = new HashMap(); + private Stack messageStack = new Stack(); + + private Map messageMap = new HashMap(); private int currentY = 0; - + public SequenceModelBuilder() { // root.setBackgroundColor(InstanceFigure.INSTANCE_COLOR.getRGB()); // root.setForegroundColor(ColorConstants.black.getRGB()); root.setShowIcon(true); } - + public InstanceModel createInstance(String instanceName) { InstanceModel model = new InstanceModel(); model.setName(instanceName); - model.setConstraint(new Rectangle( - 120 * root.getInstances().size() + 20, - InstanceModel.DEFAULT_LOCATION, 100, -1)); + model.setConstraint( + new Rectangle(120 * root.getInstances().size() + 20, InstanceModel.DEFAULT_LOCATION, 100, -1)); Rectangle lineRect = model.getConstraint().getCopy(); lineRect.translate(new Point(50, 0)); lineRect.width = 5; @@ -56,9 +56,8 @@ public InstanceModel createInstance(String instanceName) { public ActorModel createActor(String instanceName) { ActorModel model = new ActorModel(); model.setName(instanceName); - model.setConstraint(new Rectangle( - 120 * root.getInstances().size() + 20, - InstanceModel.DEFAULT_LOCATION, 100, -1)); + model.setConstraint( + new Rectangle(120 * root.getInstances().size() + 20, InstanceModel.DEFAULT_LOCATION, 100, -1)); Rectangle lineRect = model.getConstraint().getCopy(); lineRect.translate(new Point(50, 0)); lineRect.width = 5; @@ -68,11 +67,11 @@ public ActorModel createActor(String instanceName) { root.copyPresentation(model); return model; } - + public void init(InstanceModel instance) { ActivationModel model = new ActivationModel(); - model.setConstraint(new Rectangle(instance.getConstraint().x + 45, 70, - ActivationModel.DEFAULT_WIDTH, ActivationModel.DEFAULT_HEIGHT)); + model.setConstraint(new Rectangle(instance.getConstraint().x + 45, 70, ActivationModel.DEFAULT_WIDTH, + ActivationModel.DEFAULT_HEIGHT)); instance.getModel().addActivation(model); current = model; currentY = 70; @@ -80,15 +79,14 @@ public void init(InstanceModel instance) { } /** - * + * * @param key [source instance name ]-[message name]-[target instance name] */ public void back(String key) { - MessageModel model = (MessageModel) messageMap.get(key); + MessageModel model = messageMap.get(key); back(model); } - /** * * @param model @@ -101,40 +99,34 @@ public void back(MessageModel model) { if (target instanceof ActivationModel) { currentY = target.getConstraint().y + target.getConstraint().height + 20; } else { - currentY = target.getConstraint().y + target.getConstraint().height + 40; + currentY = target.getConstraint().y + target.getConstraint().height + 40; } - } + } } - + public void endMessage() { if (!messageStack.isEmpty()) { - MessageModel model = (MessageModel) messageStack.pop(); + MessageModel model = messageStack.pop(); back(model); } } - + public MessageModel createMessage(String message, String instanceName) { InstanceModel model = createInstance(instanceName); return createMessage(message, model); } - + public MessageModel createMessage(String message, InstanceModel target) { ActivationModel model = new ActivationModel(); current.copyPresentation(model); - ActivationModel targetModel = getTargetModel( - currentY, target); + ActivationModel targetModel = getTargetModel(currentY, target); if (targetModel == null) { - model.setConstraint(new Rectangle(target.getConstraint().x + 45, - currentY, - ActivationModel.DEFAULT_WIDTH, + model.setConstraint(new Rectangle(target.getConstraint().x + 45, currentY, ActivationModel.DEFAULT_WIDTH, ActivationModel.DEFAULT_HEIGHT)); target.getModel().addActivation(model); } else { - model.setConstraint(new Rectangle(target.getConstraint().x + 45 - + current.getNestLevel() * 5, - current.getConstraint().y + 20, - ActivationModel.DEFAULT_WIDTH, - ActivationModel.DEFAULT_HEIGHT)); + model.setConstraint(new Rectangle(target.getConstraint().x + 45 + current.getNestLevel() * 5, + current.getConstraint().y + 20, ActivationModel.DEFAULT_WIDTH, ActivationModel.DEFAULT_HEIGHT)); targetModel.addActivation(model); } SyncMessageModel messageModel = new SyncMessageModel(); @@ -145,16 +137,16 @@ public MessageModel createMessage(String message, InstanceModel target) { messageModel.attachTarget(); current.copyPresentation(messageModel); messageStack.push(messageModel); - + ReturnMessageModel returnMessageModel = new ReturnMessageModel(); returnMessageModel.setSource(model); returnMessageModel.setTarget(current); returnMessageModel.attachSource(); returnMessageModel.attachTarget(); current.copyPresentation(returnMessageModel); - - messageMap.put(current.getOwnerLine().getOwner().getName() + "-" - + message + "-" + target.getName(), messageModel); + + messageMap.put(current.getOwnerLine().getOwner().getName() + "-" + message + "-" + target.getName(), + messageModel); model.computeCaller(); current = model; currentY += 20; @@ -165,10 +157,8 @@ public MessageModel createSelfCallMessage(String message) { ActivationModel model = new ActivationModel(); current.copyPresentation(model); currentY += 20; - model.setConstraint(new Rectangle(current.getConstraint().x + 5, - currentY, - ActivationModel.DEFAULT_WIDTH, - ActivationModel.DEFAULT_HEIGHT)); + model.setConstraint(new Rectangle(current.getConstraint().x + 5, currentY, ActivationModel.DEFAULT_WIDTH, + ActivationModel.DEFAULT_HEIGHT)); current.addActivation(model); SyncMessageModel messageModel = new SyncMessageModel(); messageModel.setName(message); @@ -183,12 +173,12 @@ public MessageModel createSelfCallMessage(String message) { currentY += 20; return messageModel; } - + public MessageModel createCreationMessage(String message, String instanceName) { InstanceModel model = createInstance(instanceName); return createCreationMessage(message, model); } - + public MessageModel createCreationMessage(String message, InstanceModel target) { Rectangle rectangle = target.getConstraint().getCopy(); Point p = rectangle.getTopLeft(); @@ -204,23 +194,22 @@ public MessageModel createCreationMessage(String message, InstanceModel target) messageStack.push(messageModel); ActivationModel newModel = new ActivationModel(); newModel.setMovable(false); - Point actP = rectangle.getBottom().getCopy().getTranslated(- ActivationModel.DEFAULT_WIDTH / 2,20); + Point actP = rectangle.getBottom().getCopy().getTranslated(-ActivationModel.DEFAULT_WIDTH / 2, 20); target.copyPresentation(newModel); target.getModel().addActivation(newModel); target.setActive(newModel); - newModel.setConstraint(new Rectangle(actP, new Dimension(ActivationModel.DEFAULT_WIDTH, ActivationModel.DEFAULT_HEIGHT))); + newModel.setConstraint( + new Rectangle(actP, new Dimension(ActivationModel.DEFAULT_WIDTH, ActivationModel.DEFAULT_HEIGHT))); current = newModel; currentY += 40; return messageModel; } - + private ActivationModel getTargetModel(int y, InstanceModel target) { - List children = target.getModel().getChildren(); - for (Iterator iter = children.iterator(); iter.hasNext();) { + List children = target.getModel().getChildren(); + for (Iterator iter = children.iterator(); iter.hasNext();) { ActivationModel element = (ActivationModel) iter.next(); - if (element.getConstraint().y < y - && element.getConstraint().y - + element.getConstraint().height > y) { + if (element.getConstraint().y < y && element.getConstraint().y + element.getConstraint().height > y) { return element; } } @@ -234,12 +223,12 @@ public String toXML() { } // public ActivationModel createInstanciateMessage(String message, // ActivationModel source, InstanceModel target) { - // + // // } // // public ActivationWrapper createRecursiveMessage(String message, // ActivationWrapper source, InstanceWrapper target) { - // + // // } } diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/SyncMessageModel.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/SyncMessageModel.java index 6a34652..7f27375 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/SyncMessageModel.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/model/SyncMessageModel.java @@ -18,7 +18,7 @@ public class SyncMessageModel extends MessageModel { private int order, oldOrder; - private static int number = 1; +// private static int number = 1; public SyncMessageModel() { setName(""); @@ -26,18 +26,18 @@ public SyncMessageModel() { public void attachSource() { super.attachSource(); - number++; +// number++; } public void detachSource() { super.detachSource(); - number--; +// number--; } public void setOrder(int order) { this.oldOrder = this.order; this.order = order; - firePropertyChange(P_ORDER, new Integer(oldOrder), new Integer(this.order)); + firePropertyChange(P_ORDER, oldOrder, this.order); } public int getOrder() { diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/property/MessagePropertyDescriptor.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/property/MessagePropertyDescriptor.java index f4e13b5..c0964b4 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/property/MessagePropertyDescriptor.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/property/MessagePropertyDescriptor.java @@ -9,25 +9,28 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.ui.views.properties.PropertyDescriptor; +import net.java.amateras.uml.model.AbstractUMLModel; + /** * @author shida * */ public class MessagePropertyDescriptor extends PropertyDescriptor { - List models; - + private List models; + public MessagePropertyDescriptor(Object id, String displayName) { super(id, displayName); } - public void setUMLModels(List models) { + public void setUMLModels(List models) { this.models = models; } + public CellEditor createPropertyEditor(Composite parent) { MessageTextCellEditor cellEditor = new MessageTextCellEditor(parent); cellEditor.setUMLModel(models); - if (getValidator() != null){ + if (getValidator() != null) { cellEditor.setValidator(getValidator()); } return cellEditor; diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/property/MessageTextCellEditor.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/property/MessageTextCellEditor.java index c3087ca..f68495e 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/property/MessageTextCellEditor.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/sequencediagram/property/MessageTextCellEditor.java @@ -38,7 +38,7 @@ */ public class MessageTextCellEditor extends TextCellEditor { - private List umlModel = new ArrayList(); + private List umlModel = new ArrayList(); public MessageTextCellEditor() { super(); @@ -56,7 +56,7 @@ public MessageTextCellEditor(Composite parent) { * * @param umlModel */ - public void setUMLModel(List umlModel) { + public void setUMLModel(List umlModel) { this.umlModel = umlModel; } @@ -124,8 +124,8 @@ public ICompletionProposal[] computeCompletionProposals( int documentOffset) { int caretPosition = text.getCaretPosition(); String previouse = text.getText().substring(0, caretPosition); - List result = new ArrayList(); - for (Iterator iter = umlModel.iterator(); iter.hasNext();) { + List result = new ArrayList(); + for (Iterator iter = umlModel.iterator(); iter.hasNext();) { AbstractUMLModel model = (AbstractUMLModel) iter.next(); CompletionProposal proposal = createProposal(model, previouse, documentOffset); if (proposal != null && proposal.getDisplayString().startsWith(previouse)) { diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/usecasediagram/MultiPageEditor.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/usecasediagram/MultiPageEditor.java index 1d68881..04aa588 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/usecasediagram/MultiPageEditor.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/usecasediagram/MultiPageEditor.java @@ -38,7 +38,7 @@ public class MultiPageEditor extends MultiPageEditorPart implements IResourceCha private UsecaseDiagramEditor useCaseDiagramEditor; - private Map editorMap = new HashMap(); + private Map editorMap = new HashMap(); /** * Creates a multi-page editor example. @@ -63,13 +63,13 @@ void createEmptyPage(Object newValue) { EmptyEditor editor = new EmptyEditor(); int index = addPage(editor, getEditorInput()); setPageText(index, "ユースケース " + index); - editorMap.put(newValue, new Integer(index)); + editorMap.put(newValue, index); } catch (PartInitException e) { } } void removeEmptyEditor(Object oldValue) { - Integer index = (Integer) editorMap.get(oldValue); + Integer index = editorMap.get(oldValue); removePage(index.intValue()); } /** diff --git a/net.java.amateras.umleditor/src/net/java/amateras/uml/usecasediagram/model/UsecaseRootModel.java b/net.java.amateras.umleditor/src/net/java/amateras/uml/usecasediagram/model/UsecaseRootModel.java index f63df9b..270e750 100644 --- a/net.java.amateras.umleditor/src/net/java/amateras/uml/usecasediagram/model/UsecaseRootModel.java +++ b/net.java.amateras.umleditor/src/net/java/amateras/uml/usecasediagram/model/UsecaseRootModel.java @@ -8,6 +8,7 @@ import java.util.Comparator; import java.util.List; +import net.java.amateras.uml.model.AbstractUMLModel; import net.java.amateras.uml.model.RootModel; /** @@ -16,11 +17,10 @@ */ public class UsecaseRootModel extends RootModel { - public List getChildren() { - List children = new ArrayList(super.getChildren()); - Collections.sort(children, new Comparator() { - - public int compare(Object arg0, Object arg1) { + public List getChildren() { + List children = new ArrayList(super.getChildren()); + Collections.sort(children, new Comparator() { + public int compare(AbstractUMLModel arg0, AbstractUMLModel arg1) { if (arg0 instanceof SystemModel && !(arg1 instanceof SystemModel)) { return -1; } else if (arg1 instanceof SystemModel && !(arg0 instanceof SystemModel)) {