Prep for 0.0.7 release

ChangeLog.txt

@@ -1,4 +1,45 @@
 
+------------------------------------------------------------------------------
+-- 0.0.8 Release --
+
+?- Correct display of input/output/lock/share fields in outline (030)
+
+?- Add an icon for input/output
+
+?- Add an icon for lock/share
+
+?- Add an icon for activity
+
+?- Add an icon for exec block
+
+?- Add an icon for symbol declaration
+
+- Up to #99
+
+------------------------------------------------------------------------------
+-- 0.0.7 Release --
+
+- Add an icon for constraints
+
+- Correct labeling for packages
+
+- Change the outline view to show the first level of content by default
+
+- Correct the outline display of action-type fields
+
+- Correct the outline display of pool-type fields
+
+- Correct display of symbols
+
+------------------------------------------------------------------------------
+-- 0.0.6 Release --
+
+- Update language grammar to the 1.0.0 spec
+
+- Update support for folding
+
+- Some improvements to the outline view
+
 ------------------------------------------------------------------------------
 -- 0.0.5 Release --
 

etc/psde.info

@@ -2,7 +2,7 @@
 #* psde.info
 #****************************************************************************
 
-version=0.0.5
+version=0.0.7
 
 version_type=release
 # version_type=testing

psde/plugins/org.psstools.psde.lang.ui/src/org/psstools/psde/lang/ui/PSSUiModule.java

@@ -20,9 +20,12 @@
 
 import org.eclipse.jface.viewers.ILabelProvider;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
 import org.eclipse.xtext.ui.editor.folding.IFoldingRegionProvider;
+import org.eclipse.xtext.ui.editor.outline.impl.OutlinePage;
 import org.eclipse.xtext.ui.editor.outline.impl.OutlineFilterAndSorter.IComparator;
 import org.psstools.psde.lang.ui.labeling.PSSLabelProvider;
+import org.psstools.psde.lang.ui.outline.PSSOutlinePage;
 
 import com.google.inject.Binder;
 
@@ -48,6 +51,9 @@ public void configure(Binder binder) {
 	public Class<? extends ILabelProvider> bindILabelProvider() {
 		return PSSLabelProvider.class;
 	}
-
-
+
+	@Override
+	public Class<? extends IContentOutlinePage> bindIContentOutlinePage() {
+		return PSSOutlinePage.class;
+	}
 }

psde/plugins/org.psstools.psde.lang.ui/src/org/psstools/psde/lang/ui/labeling/PSSLabelProvider.java

@@ -26,6 +26,8 @@
 import org.psstools.psde.lang.pSS.bool_type;
 import org.psstools.psde.lang.pSS.component_declaration;
 import org.psstools.psde.lang.pSS.component_field_declaration;
+import org.psstools.psde.lang.pSS.constraint_block;
+import org.psstools.psde.lang.pSS.constraint_declaration;
 import org.psstools.psde.lang.pSS.data_declaration;
 import org.psstools.psde.lang.pSS.data_instantiation;
 import org.psstools.psde.lang.pSS.enum_declaration;
@@ -93,7 +95,7 @@ public String text(extend_stmt e) {
 	}
 
 	public String text(package_declaration p) {
-		return p.getName() + " : package";
+		return p.getName().getElems().get(0) + " : package";
 	}
 
 
@@ -159,6 +161,11 @@ public Object image(extend_stmt s) {
 	public Object image(component_field_declaration f) { 
 		return "field_public_obj.gif"; 
 	}
+
+	public Object image(constraint_declaration c) {
+		return "constraint_obj.gif";
+	}
+
 	public Object image(data_instantiation f) { 
 		return "field_public_obj.gif"; 
 	}
@@ -174,6 +181,7 @@ public Object image(struct_declaration s) {
 	public Object image(package_declaration p) { 
 		return "package.gif"; 
 	}
+
 //	public Object image(struct_field_declaration f) { 
 //		return "field_public_obj.gif"; 
 //	}

psde/plugins/org.psstools.psde.lang.ui/src/org/psstools/psde/lang/ui/outline/PSSOutlinePage.java

@@ -0,0 +1,12 @@
+package org.psstools.psde.lang.ui.outline;
+
+import org.eclipse.xtext.ui.editor.outline.impl.OutlinePage;
+
+public class PSSOutlinePage extends OutlinePage {
+
+	@Override
+	protected int getDefaultExpansionLevel() {
+		return 2;
+	}
+
+}

psde/plugins/org.psstools.psde.lang.ui/src/org/psstools/psde/lang/ui/outline/PSSOutlineTreeProvider.java

@@ -24,20 +24,25 @@
 import org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider;
 import org.psstools.psde.lang.pSS.action_declaration;
 import org.psstools.psde.lang.pSS.activity_action_traversal_stmt;
+import org.psstools.psde.lang.pSS.activity_data_field;
 import org.psstools.psde.lang.pSS.activity_declaration;
 import org.psstools.psde.lang.pSS.attr_field;
 import org.psstools.psde.lang.pSS.component_declaration;
+import org.psstools.psde.lang.pSS.component_pool_declaration;
 import org.psstools.psde.lang.pSS.constraint_declaration;
 import org.psstools.psde.lang.pSS.covergroup_declaration;
 import org.psstools.psde.lang.pSS.data_declaration;
 import org.psstools.psde.lang.pSS.data_instantiation;
 import org.psstools.psde.lang.pSS.enum_declaration;
 import org.psstools.psde.lang.pSS.exec_block_stmt;
+import org.psstools.psde.lang.pSS.extend_stmt;
+import org.psstools.psde.lang.pSS.flow_ref_field;
 import org.psstools.psde.lang.pSS.function_decl;
 import org.psstools.psde.lang.pSS.inline_covergroup;
 import org.psstools.psde.lang.pSS.object_bind_stmt;
 import org.psstools.psde.lang.pSS.overrides_declaration;
 import org.psstools.psde.lang.pSS.struct_declaration;
+import org.psstools.psde.lang.pSS.symbol_declaration;
 import org.psstools.psde.lang.pSS.typedef_declaration;
 
 /**
@@ -67,6 +72,10 @@ public IOutlineNode createRoot(IXtextDocument document) {
 	public boolean _isLeaf(object_bind_stmt e) { return true; }
 	public boolean _isLeaf(exec_block_stmt e) { return true; }
 	public boolean _isLeaf(function_decl e) { return true; }
+	public boolean _isLeaf(activity_declaration e) { return true; }
+	public boolean _isLeaf(symbol_declaration e) { return true; }
+
+	public boolean _isLeaf(extend_stmt e) { return true; }
 
 	public void _createChildren(IOutlineNode parentNode, activity_declaration activity) {
 		for (EObject c : activity.getBody()) {
@@ -86,11 +95,22 @@ public void _createChildren(IOutlineNode parentNode, action_declaration struct)
                                 for (EObject value : field.getDeclaration().getInstances()) {
                                         createNode(parentNode, value);
                                 }
+                        } else if (child instanceof activity_data_field) {
+                                activity_data_field field = (activity_data_field)child;
+                                for (EObject value : field.getDeclaration().getInstances()) {
+                                        createNode(parentNode, value);
+                                }
                         } else {
                                 createNode(parentNode, child);
                         }
                 }
         }
+
+//        public void _createChildren(IOutlineNode parentNode, flow_ref_field f) {
+//        	for (String child : f.getId()) {
+//        		createNode(parentNode, child);
+//        	}
+//        }
 
         public void _createChildren(IOutlineNode parentNode, covergroup_declaration cs) {
                 for (EObject child : cs.getBody_items()) {
@@ -102,6 +122,8 @@ public void _createChildren(IOutlineNode parentNode, component_declaration compo
         	for (EObject child : component.getBody()) {
         		if (child instanceof attr_field) {
         			_createChildren(parentNode, ((attr_field)child).getDeclaration());
+        		} else if (child instanceof component_pool_declaration) {
+        			_createChildren(parentNode, ((component_pool_declaration)child).getDeclaration());
         		} else {
         			if (!(child instanceof object_bind_stmt)) {
         				createNode(parentNode, child);
@@ -125,7 +147,7 @@ public void _createChildren(IOutlineNode parent, struct_declaration struct) {
         		}
         	}
         }
-
+        
         public void _createChildren(IOutlineNode parentNode, data_declaration dd) {
                 for (data_instantiation child : dd.getInstances()) {
                         createNode(parentNode, child);

psde/plugins/org.psstools.psde.lang/src/org/psstools/psde/lang/formatter/PSSFormatter.java

@@ -34,16 +34,19 @@ protected void configureFormatting(FormattingConfig config) {
 
 	}
 
-	@Override
-	public ITokenStream createFormatterStream(String indent, ITokenStream out, boolean preserveWhitespaces) {
-		// TODO Auto-generated method stub
-		System.out.println("createFormatterStream");
-		return super.createFormatterStream(indent, out, preserveWhitespaces);
-	}
+//	@Override
+//	public ITokenStream createFormatterStream(String indent, ITokenStream out, boolean preserveWhitespaces) {
+//		// TODO Auto-generated method stub
+//		System.out.println("createFormatterStream");
+//		return super.createFormatterStream(indent, out, preserveWhitespaces);
+//	}
 
 	@Override
-	public ITokenStream createFormatterStream(EObject context, String indent, ITokenStream out,
-			boolean preserveWhitespaces) {
+	public ITokenStream createFormatterStream(
+			EObject 		context, 
+			String 			indent, 
+			ITokenStream 	out,
+			boolean 		preserveWhitespaces) {
 		System.out.println("createFormatterStream(2)");
 		// TODO Auto-generated method stub
 		return super.createFormatterStream(context, indent, out, preserveWhitespaces);

scripts/mw2e_org.psstools.psde.lang.feature.xml

@@ -140,7 +140,7 @@
 	    buildDirectory="${buildDirectory}"
             baseLocation="${eclipse.home}"
 	    forceContextQualifier="0"
-            configInfo="linux,gtk,x86_64"
+	    configInfo="${os},${ws},${arch}"
 	    generateFeatureVersionSuffix="true"
 	    outputUpdateJars="true"/>