Refactored to move model, validation and other components into protocol specific components. Core will be renamed as scribble.common, and have the utilities, logging, etc. Need to test that validator implementations still being detected.

Author: Gary Brown

integration/eclipse/plugins/org.scribble.designer/src/java/org/scribble/designer/DesignerServices.java

@@ -16,8 +16,8 @@
  */
 package org.scribble.designer;
 
-import org.scribble.core.validation.ValidationManager;
 import org.scribble.protocol.parser.ProtocolParser;
+import org.scribble.protocol.validation.ValidationManager;
 
 /**
  * This class provides a manager for accessing services used

integration/eclipse/plugins/org.scribble.designer/src/java/org/scribble/designer/actions/ValidateAction.java

@@ -24,9 +24,9 @@
 import org.eclipse.swt.widgets.MessageBox;
 import org.eclipse.ui.IObjectActionDelegate;
 import org.eclipse.ui.IWorkbenchPart;
-import org.scribble.core.model.Model;
 import org.scribble.designer.DesignerServices;
 import org.scribble.designer.logger.EclipseScribbleLogger;
+import org.scribble.protocol.model.Model;
 import org.scribble.protocol.model.Protocol;
 
 public class ValidateAction implements IObjectActionDelegate {

integration/eclipse/plugins/org.scribble.designer/src/java/org/scribble/designer/editor/NewScribbleWizard.java

@@ -47,8 +47,8 @@
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
-import org.scribble.core.model.ModelReference;
-import org.scribble.core.model.Notation;
+import org.scribble.protocol.model.ModelReference;
+import org.scribble.protocol.model.Notation;
 
 /**
  * This class provides the wizard responsible for creating
@@ -295,8 +295,8 @@ protected void initFileCreationPage() {
 
     private IWorkbench m_workbench=null;
 	private IStructuredSelection m_selection=null;
-	private java.util.List<org.scribble.core.model.Notation> m_notations=
-			new java.util.Vector<org.scribble.core.model.Notation>();
+	private java.util.List<org.scribble.protocol.model.Notation> m_notations=
+			new java.util.Vector<org.scribble.protocol.model.Notation>();
 	private ScribbleNewFileCreationPage m_newFileCreationPage=null;
 	private NotationSelectionPage m_notationSelection=null;
 

integration/eclipse/plugins/org.scribble.designer/src/java/org/scribble/designer/editor/ScribbleContentOutlinePage.java

@@ -23,8 +23,8 @@
 import org.eclipse.ui.texteditor.IDocumentProvider;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.scribble.core.model.ModelProperties;
 import org.scribble.designer.editor.outliner.DefaultModelOutliner;
+import org.scribble.protocol.model.ModelProperties;
 
 /**
  * A content outline page which always represents the content of the
@@ -190,9 +190,9 @@ public void selectionChanged(SelectionChangedEvent event) {
 		} else {
 
 			if (((IStructuredSelection) selection).getFirstElement() instanceof 
-					org.scribble.core.model.ModelObject) {
-				org.scribble.core.model.ModelObject mobj=
-						(org.scribble.core.model.ModelObject)
+					org.scribble.protocol.model.ModelObject) {
+				org.scribble.protocol.model.ModelObject mobj=
+						(org.scribble.protocol.model.ModelObject)
 							((IStructuredSelection) selection).getFirstElement();
 
 				if (mobj.getProperties().containsKey(ModelProperties.START_LOCATION) &&
@@ -263,7 +263,7 @@ public void update() {
 		}
 	}
 
-	private org.scribble.core.model.Model m_model=null;
-	private org.scribble.core.model.ModelReference m_reference=null;
+	private org.scribble.protocol.model.Model m_model=null;
+	private org.scribble.protocol.model.ModelReference m_reference=null;
 	private org.scribble.designer.editor.outliner.ModelOutliner m_outliner=null;
 }

integration/eclipse/plugins/org.scribble.designer/src/java/org/scribble/designer/editor/outliner/DefaultModelOutliner.java

@@ -17,8 +17,8 @@
 package org.scribble.designer.editor.outliner;
 
 import org.eclipse.swt.graphics.Image;
-import org.scribble.core.model.*;
 import org.scribble.designer.editor.ScribbleImages;
+import org.scribble.protocol.model.ModelReference;
 
 /**
  * This is the abstract base implementation of the ModelOutliner
@@ -41,8 +41,8 @@ public String getLabel(ModelReference ref, Object obj) {
 
 		if (ret == null) {
 
-			if (obj instanceof org.scribble.core.model.Declaration) {
-				ret = ((org.scribble.core.model.Declaration)obj).getName();
+			if (obj instanceof org.scribble.protocol.model.Declaration) {
+				ret = ((org.scribble.protocol.model.Declaration)obj).getName();
 			}
 		}
 
@@ -64,9 +64,9 @@ public org.eclipse.swt.graphics.Image getImage(ModelReference ref, Object obj) {
 
 		if (ret == null) {
 
-			if (obj instanceof org.scribble.core.model.Declaration) {
+			if (obj instanceof org.scribble.protocol.model.Declaration) {
 				ret = ScribbleImages.getImage("declaration.png");
-			} else if (obj instanceof org.scribble.core.model.Activity) {
+			} else if (obj instanceof org.scribble.protocol.model.Activity) {
 				ret = ScribbleImages.getImage("activity.png");
 			}
 		}

integration/eclipse/plugins/org.scribble.designer/src/java/org/scribble/designer/editor/outliner/ModelOutliner.java

@@ -16,7 +16,7 @@
  */
 package org.scribble.designer.editor.outliner;
 
-import org.scribble.core.model.*;
+import org.scribble.protocol.model.ModelReference;
 
 /**
  * This interface represents the component responsible for providing

integration/eclipse/plugins/org.scribble.designer/src/java/org/scribble/designer/osgi/Activator.java

@@ -22,13 +22,13 @@
 import org.osgi.framework.ServiceEvent;
 import org.osgi.framework.ServiceListener;
 import org.osgi.framework.ServiceReference;
-import org.scribble.core.validation.DefaultValidationManager;
-import org.scribble.core.validation.ValidationManager;
 import org.scribble.designer.DesignerServices;
 import org.scribble.designer.editor.*;
 import org.scribble.designer.editor.lang.*;
 import org.scribble.designer.editor.util.*;
 import org.scribble.protocol.parser.ProtocolParser;
+import org.scribble.protocol.validation.DefaultValidationManager;
+import org.scribble.protocol.validation.ValidationManager;
 
 import java.util.logging.*;
 import org.eclipse.core.runtime.IStatus;

modules/org.scribble.command/META-INF/MANIFEST.MF

@@ -5,11 +5,9 @@ Bundle-Version: 1.0.0
 Bundle-Activator: org.scribble.command.osgi.Activator
 Export-Package: org.scribble.command
 Import-Package: org.osgi.framework,
- org.scribble.core.conformance,
+ org.scribble.conformance,
  org.scribble.core.logger,
- org.scribble.core.model,
- org.scribble.core.parser,
- org.scribble.core.validation,
+ org.scribble.protocol.validation,
  org.scribble.protocol.model,
  org.scribble.protocol.parser
 Bundle-SymbolicName: org.scribble.command

modules/org.scribble.command/pom.xml

@@ -29,6 +29,11 @@
       <artifactId>org.scribble.protocol</artifactId>
       <version>${scribble.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.scribble.modules</groupId>
+      <artifactId>org.scribble.conformance</artifactId>
+      <version>${scribble.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.scribble.modules</groupId>
       <artifactId>org.scribble.protocol.parser</artifactId>

modules/org.scribble.command/src/main/java/org/scribble/command/conforms/ConformsCommand.java

@@ -16,7 +16,7 @@
  */
 package org.scribble.command.conforms;
 
-import org.scribble.core.conformance.Conformer;
+import org.scribble.conformance.Conformer;
 import org.scribble.core.logger.ScribbleLogger;
 import org.scribble.protocol.model.Protocol;
 import org.scribble.protocol.parser.ProtocolParser;
@@ -61,14 +61,14 @@ public boolean execute(String args[]) {
 				try {
 					java.io.InputStream is=new java.io.FileInputStream(f1);
 
-					org.scribble.core.model.Model<Protocol> p1=
+					org.scribble.protocol.model.Model<Protocol> p1=
 							m_protocolParser.parse(is, m_logger);
 
 					is.close();
 
 					is=new java.io.FileInputStream(f2);
 
-					org.scribble.core.model.Model<Protocol> p2=
+					org.scribble.protocol.model.Model<Protocol> p2=
 							m_protocolParser.parse(is, m_logger);
 
 					is.close();