Code Refactored

plugin.xml

@@ -5,7 +5,7 @@
 
 	<extension id="SWRLTab" point="org.protege.editor.core.application.WorkspaceTab">
 		<label value="OWLAx"/>
-		<class value="edu.wsu.dase.OdpMainUITab"/>
+		<class value="edu.wright.dase.OdpMainUITab"/>
 		<index value="X"/>
 		<editorKitId value="OWLEditorKit"/>
   </extension>  

src/main/java/com/mxgraph/io/mxCodecRegistry.java

@@ -42,7 +42,7 @@ public class mxCodecRegistry
 	// Registers the known codecs and package names
 	static
 	{
-		addPackage("edu.wsu.dase.util");
+		addPackage("edu.wright.dase.util");
 		addPackage("com.mxgraph");
 		addPackage("com.mxgraph.util");
 		addPackage("com.mxgraph.model");

src/main/java/com/mxgraph/io/protegeEntityCodec.java

@@ -10,7 +10,7 @@
 //import com.mxgraph.util.mxUtils;
 //import com.mxgraph.view.mxStylesheet;
 //
-//import edu.wsu.dase.util.CustomEntityType;
+//import edu.wright.dase.util.CustomEntityType;
 //
 //public class protegeEntityCodec extends mxObjectCodec {
 //

src/main/java/com/mxgraph/model/mxCell.java

@@ -10,7 +10,7 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
-import edu.wsu.dase.util.CustomEntityType;
+import edu.wright.dase.util.CustomEntityType;
 
 /**
  * Cells are the elements of the graph model. They represent the state of the

src/main/java/com/mxgraph/model/mxGraphModel.java

@@ -22,7 +22,7 @@
 import com.mxgraph.util.mxPoint;
 import com.mxgraph.util.mxUndoableEdit;
 
-import edu.wsu.dase.util.CustomEntityType;
+import edu.wright.dase.util.CustomEntityType;
 
 /**
  * Extends mxEventSource to implement a graph model. The graph model acts as a

src/main/java/com/mxgraph/model/mxICell.java

@@ -3,7 +3,7 @@
  */
 package com.mxgraph.model;
 
-import edu.wsu.dase.util.CustomEntityType;
+import edu.wright.dase.util.CustomEntityType;
 
 /**
  * Defines the requirements for a cell that can be used in an mxGraphModel.

src/main/java/com/mxgraph/model/mxIGraphModel.java

@@ -6,7 +6,7 @@
 import com.mxgraph.util.mxEventSource.mxIEventListener;
 import com.mxgraph.util.mxUndoableEdit.mxUndoableChange;
 
-import edu.wsu.dase.util.CustomEntityType;
+import edu.wright.dase.util.CustomEntityType;
 
 /**
  * Defines the requirements for a graph model to be used with mxGraph.

src/main/java/com/mxgraph/swing/handler/mxEdgeHandler.java

@@ -32,7 +32,7 @@
 import com.mxgraph.view.mxGraph;
 import com.mxgraph.view.mxGraphView;
 
-import edu.wsu.dase.util.CustomEntityType;
+import edu.wright.dase.util.CustomEntityType;
 
 /**
  *

src/main/java/com/mxgraph/swing/mxGraphComponent.java

@@ -79,12 +79,13 @@
 import com.mxgraph.view.mxCellState;
 import com.mxgraph.view.mxEdgeStyle;
 import com.mxgraph.view.mxEdgeStyle.mxEdgeStyleFunction;
+
+import edu.wright.dase.swing.editor.BasicGraphEditor;
+
 import com.mxgraph.view.mxGraph;
 import com.mxgraph.view.mxGraphView;
 import com.mxgraph.view.mxTemporaryCellStates;
 
-import edu.wsu.dase.swing.editor.BasicGraphEditor;
-
 /**
  * For setting the preferred size of the viewport for scrolling, use
  * mxGraph.setMinimumGraphSize. This component is a combined scrollpane with an

src/main/java/com/mxgraph/swing/view/mxCellEditor.java

@@ -40,7 +40,7 @@
 import com.mxgraph.util.mxUtils;
 import com.mxgraph.view.mxCellState;
 
-import edu.wsu.dase.util.CustomEntityType;
+import edu.wright.dase.util.CustomEntityType;
 
 /**
  * To control this editor, use mxGraph.invokesStopCellEditing, mxGraph.

src/main/java/com/mxgraph/view/mxGraph.java

@@ -52,9 +52,10 @@
 import com.mxgraph.util.mxStyleUtils;
 import com.mxgraph.util.mxUndoableEdit;
 import com.mxgraph.util.mxUndoableEdit.mxUndoableChange;
-import com.mxgraph.util.mxUtils;
 
-import edu.wsu.dase.util.CustomEntityType;
+import edu.wright.dase.util.CustomEntityType;
+
+import com.mxgraph.util.mxUtils;
 
 /**
  * Implements a graph object that allows to create diagrams from a graph model

src/main/java/edu/wsu/dase/AxiomsDialog.java → src/main/java/edu/wright/dase/AxiomsDialog.java

@@ -1,4 +1,4 @@
-package edu.wsu.dase;
+package edu.wright.dase;
 
 import java.awt.BorderLayout;
 import java.awt.Button;

src/main/java/edu/wsu/dase/CustomCheckBoxCellRenderer.java → src/main/java/edu/wright/dase/CustomCheckBoxCellRenderer.java

@@ -1,4 +1,4 @@
-package edu.wsu.dase;
+package edu.wright.dase;
 
 import java.awt.Component;
 import java.awt.Rectangle;

src/main/java/edu/wsu/dase/GraphEditor.java → src/main/java/edu/wright/dase/GraphEditor.java

@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2006-2012, JGraph Ltd */
-package edu.wsu.dase;
+package edu.wright.dase;
 
 import java.awt.Color;
 import java.awt.Point;
@@ -30,10 +30,10 @@
 import com.mxgraph.view.mxCellState;
 import com.mxgraph.view.mxGraph;
 
-import edu.wsu.dase.swing.editor.BasicGraphEditor;
-import edu.wsu.dase.swing.editor.EditorMenuBar;
-import edu.wsu.dase.swing.editor.EditorPalette;
-import edu.wsu.dase.util.CustomEntityType;
+import edu.wright.dase.swing.editor.BasicGraphEditor;
+import edu.wright.dase.swing.editor.EditorMenuBar;
+import edu.wright.dase.swing.editor.EditorPalette;
+import edu.wright.dase.util.CustomEntityType;
 
 public class GraphEditor extends BasicGraphEditor {
 	/**

src/main/java/edu/wsu/dase/IntegrateOntologyWithProtege.java → src/main/java/edu/wright/dase/IntegrateOntologyWithProtege.java

@@ -1,4 +1,4 @@
-package edu.wsu.dase;
+package edu.wright.dase;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -57,8 +57,8 @@
 import com.mxgraph.model.mxGraphModel;
 import com.mxgraph.view.mxGraph;
 
-import edu.wsu.dase.swing.editor.BasicGraphEditor;
-import edu.wsu.dase.util.CustomEntityType;
+import edu.wright.dase.swing.editor.BasicGraphEditor;
+import edu.wright.dase.util.CustomEntityType;
 
 /**
  * @author sarker

src/main/java/edu/wsu/dase/JCheckBoxTree.java → src/main/java/edu/wright/dase/JCheckBoxTree.java

@@ -1,4 +1,4 @@
-package edu.wsu.dase;
+package edu.wright.dase;
 
 import java.awt.BorderLayout;
 import java.awt.Color;

src/main/java/edu/wsu/dase/OWLCellRenderer.java → src/main/java/edu/wright/dase/OWLCellRenderer.java

@@ -1,4 +1,4 @@
-package edu.wsu.dase;
+package edu.wright.dase;
 
 import java.awt.AlphaComposite;
 import java.awt.Color;

src/main/java/edu/wsu/dase/OdpMainUITab.java → src/main/java/edu/wright/dase/OdpMainUITab.java

@@ -1,4 +1,4 @@
-package edu.wsu.dase;
+package edu.wright.dase;
 
 import java.awt.BorderLayout;
 
@@ -16,7 +16,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import edu.wsu.dase.swing.editor.EditorMenuBar;
+import edu.wright.dase.swing.editor.EditorMenuBar;
 
 public class OdpMainUITab extends OWLWorkspaceViewsTab {
 

src/main/java/edu/wsu/dase/UserObjectforTreeView.java → src/main/java/edu/wright/dase/UserObjectforTreeView.java

@@ -1,4 +1,4 @@
-package edu.wsu.dase;
+package edu.wright.dase;
 
 import java.awt.Component;
 import java.util.ArrayList;

src/main/java/edu/wsu/dase/swing/editor/BasicGraphEditor.java → src/main/java/edu/wright/dase/swing/editor/BasicGraphEditor.java

@@ -1,4 +1,4 @@
-package edu.wsu.dase.swing.editor;
+package edu.wright.dase.swing.editor;
 
 import java.awt.BorderLayout;
 import java.awt.Point;

src/main/java/edu/wsu/dase/swing/editor/DefaultFileFilter.java → src/main/java/edu/wright/dase/swing/editor/DefaultFileFilter.java

@@ -6,7 +6,7 @@
  * See LICENSE file for license details. If you are unable to locate
  * this file please contact info (at) jgraph (dot) com.
  */
-package edu.wsu.dase.swing.editor;
+package edu.wright.dase.swing.editor;
 
 import java.io.File;
 

src/main/java/edu/wsu/dase/swing/editor/EditorAboutFrame.java → src/main/java/edu/wright/dase/swing/editor/EditorAboutFrame.java

@@ -1,4 +1,4 @@
-package edu.wsu.dase.swing.editor;
+package edu.wright.dase.swing.editor;
 
 import java.awt.BorderLayout;
 import java.awt.Color;

src/main/java/edu/wsu/dase/swing/editor/EditorActions.java → src/main/java/edu/wright/dase/swing/editor/EditorActions.java

@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2001-2012, JGraph Ltd
  */
-package edu.wsu.dase.swing.editor;
+package edu.wright.dase.swing.editor;
 
 import java.awt.Color;
 import java.awt.Component;
@@ -64,7 +64,7 @@
 import com.mxgraph.util.png.mxPngTextDecoder;
 import com.mxgraph.view.mxGraph;
 
-import edu.wsu.dase.IntegrateOntologyWithProtege;
+import edu.wright.dase.IntegrateOntologyWithProtege;
 
 /**
  *

src/main/java/edu/wsu/dase/swing/editor/EditorHowToUseFrame.java → src/main/java/edu/wright/dase/swing/editor/EditorHowToUseFrame.java

@@ -1,5 +1,5 @@
 
-package edu.wsu.dase.swing.editor;
+package edu.wright.dase.swing.editor;
 
 import java.awt.BorderLayout;
 import java.awt.Color;

src/main/java/edu/wsu/dase/swing/editor/EditorKeyboardHandler.java → src/main/java/edu/wright/dase/swing/editor/EditorKeyboardHandler.java

@@ -1,7 +1,7 @@
 /**
  * Copyright (c) 2008, Gaudenz Alder
  */
-package edu.wsu.dase.swing.editor;
+package edu.wright.dase.swing.editor;
 
 import javax.swing.ActionMap;
 import javax.swing.InputMap;

src/main/java/edu/wsu/dase/swing/editor/EditorMenuBar.java → src/main/java/edu/wright/dase/swing/editor/EditorMenuBar.java

@@ -1,4 +1,4 @@
-package edu.wsu.dase.swing.editor;
+package edu.wright.dase.swing.editor;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -16,36 +16,36 @@
 import com.mxgraph.util.mxResources;
 import com.mxgraph.view.mxGraph;
 
-import edu.wsu.dase.swing.editor.EditorActions.AlignCellsAction;
-import edu.wsu.dase.swing.editor.EditorActions.AutosizeAction;
-import edu.wsu.dase.swing.editor.EditorActions.BackgroundAction;
-import edu.wsu.dase.swing.editor.EditorActions.BackgroundImageAction;
-import edu.wsu.dase.swing.editor.EditorActions.ColorAction;
-import edu.wsu.dase.swing.editor.EditorActions.GridColorAction;
-import edu.wsu.dase.swing.editor.EditorActions.GridStyleAction;
-import edu.wsu.dase.swing.editor.EditorActions.HistoryAction;
-import edu.wsu.dase.swing.editor.EditorActions.KeyValueAction;
-import edu.wsu.dase.swing.editor.EditorActions.NewAction;
-import edu.wsu.dase.swing.editor.EditorActions.OpenAction;
-import edu.wsu.dase.swing.editor.EditorActions.PageBackgroundAction;
-import edu.wsu.dase.swing.editor.EditorActions.PrintAction;
-import edu.wsu.dase.swing.editor.EditorActions.PromptPropertyAction;
-import edu.wsu.dase.swing.editor.EditorActions.PromptValueAction;
-import edu.wsu.dase.swing.editor.EditorActions.RemoveExistingAxiomsAction;
-import edu.wsu.dase.swing.editor.EditorActions.SaveAction;
-import edu.wsu.dase.swing.editor.EditorActions.SaveOntologyAction;
-import edu.wsu.dase.swing.editor.EditorActions.ScaleAction;
-import edu.wsu.dase.swing.editor.EditorActions.SetLabelPositionAction;
-import edu.wsu.dase.swing.editor.EditorActions.ToggleAction;
-import edu.wsu.dase.swing.editor.EditorActions.ToggleCardinalityAxiom;
-import edu.wsu.dase.swing.editor.EditorActions.ToggleDomainAxiom;
-import edu.wsu.dase.swing.editor.EditorActions.ToggleExistentialAxiom;
-import edu.wsu.dase.swing.editor.EditorActions.ToggleGridItem;
-import edu.wsu.dase.swing.editor.EditorActions.ToggleOutlineItem;
-import edu.wsu.dase.swing.editor.EditorActions.TogglePropertyItem;
-import edu.wsu.dase.swing.editor.EditorActions.ToggleRangeAxiom;
-import edu.wsu.dase.swing.editor.EditorActions.ToggleRulersItem;
-import edu.wsu.dase.swing.editor.EditorActions.ZoomPolicyAction;
+import edu.wright.dase.swing.editor.EditorActions.AlignCellsAction;
+import edu.wright.dase.swing.editor.EditorActions.AutosizeAction;
+import edu.wright.dase.swing.editor.EditorActions.BackgroundAction;
+import edu.wright.dase.swing.editor.EditorActions.BackgroundImageAction;
+import edu.wright.dase.swing.editor.EditorActions.ColorAction;
+import edu.wright.dase.swing.editor.EditorActions.GridColorAction;
+import edu.wright.dase.swing.editor.EditorActions.GridStyleAction;
+import edu.wright.dase.swing.editor.EditorActions.HistoryAction;
+import edu.wright.dase.swing.editor.EditorActions.KeyValueAction;
+import edu.wright.dase.swing.editor.EditorActions.NewAction;
+import edu.wright.dase.swing.editor.EditorActions.OpenAction;
+import edu.wright.dase.swing.editor.EditorActions.PageBackgroundAction;
+import edu.wright.dase.swing.editor.EditorActions.PrintAction;
+import edu.wright.dase.swing.editor.EditorActions.PromptPropertyAction;
+import edu.wright.dase.swing.editor.EditorActions.PromptValueAction;
+import edu.wright.dase.swing.editor.EditorActions.RemoveExistingAxiomsAction;
+import edu.wright.dase.swing.editor.EditorActions.SaveAction;
+import edu.wright.dase.swing.editor.EditorActions.SaveOntologyAction;
+import edu.wright.dase.swing.editor.EditorActions.ScaleAction;
+import edu.wright.dase.swing.editor.EditorActions.SetLabelPositionAction;
+import edu.wright.dase.swing.editor.EditorActions.ToggleAction;
+import edu.wright.dase.swing.editor.EditorActions.ToggleCardinalityAxiom;
+import edu.wright.dase.swing.editor.EditorActions.ToggleDomainAxiom;
+import edu.wright.dase.swing.editor.EditorActions.ToggleExistentialAxiom;
+import edu.wright.dase.swing.editor.EditorActions.ToggleGridItem;
+import edu.wright.dase.swing.editor.EditorActions.ToggleOutlineItem;
+import edu.wright.dase.swing.editor.EditorActions.TogglePropertyItem;
+import edu.wright.dase.swing.editor.EditorActions.ToggleRangeAxiom;
+import edu.wright.dase.swing.editor.EditorActions.ToggleRulersItem;
+import edu.wright.dase.swing.editor.EditorActions.ZoomPolicyAction;
 
 public class EditorMenuBar extends JMenuBar {
 

src/main/java/edu/wsu/dase/swing/editor/EditorPalette.java → src/main/java/edu/wright/dase/swing/editor/EditorPalette.java

@@ -1,7 +1,7 @@
 /**
  * Copyright (c) 2007-2012, JGraph Ltd
  */
-package edu.wsu.dase.swing.editor;
+package edu.wright.dase.swing.editor;
 
 import java.awt.Color;
 import java.awt.Dimension;
@@ -34,11 +34,12 @@
 import com.mxgraph.util.mxEventObject;
 import com.mxgraph.util.mxEventSource;
 import com.mxgraph.util.mxEventSource.mxIEventListener;
+
+import edu.wright.dase.util.CustomEntityType;
+
 import com.mxgraph.util.mxPoint;
 import com.mxgraph.util.mxRectangle;
 
-import edu.wsu.dase.util.CustomEntityType;
-
 public class EditorPalette extends JPanel {
 
 	/**

src/main/java/edu/wsu/dase/swing/editor/EditorPopupMenu.java → src/main/java/edu/wright/dase/swing/editor/EditorPopupMenu.java

@@ -1,4 +1,4 @@
-package edu.wsu.dase.swing.editor;
+package edu.wright.dase.swing.editor;
 
 import javax.swing.JMenu;
 import javax.swing.JPopupMenu;
@@ -8,7 +8,7 @@
 import com.mxgraph.swing.util.mxGraphActions;
 import com.mxgraph.util.mxResources;
 
-import edu.wsu.dase.swing.editor.EditorActions.HistoryAction;
+import edu.wright.dase.swing.editor.EditorActions.HistoryAction;
 
 public class EditorPopupMenu extends JPopupMenu {
 

src/main/java/edu/wsu/dase/swing/editor/EditorRuler.java → src/main/java/edu/wright/dase/swing/editor/EditorRuler.java

@@ -6,7 +6,7 @@
  * See LICENSE file for license details. If you are unable to locate
  * this file please contact info (at) jgraph (dot) com.
  */
-package edu.wsu.dase.swing.editor;
+package edu.wright.dase.swing.editor;
 
 import java.awt.Color;
 import java.awt.Dimension;