Added x-friends/x-internal to Photran internal package exports; added API filters; incremented version number to 8.0.0; changed build and execution environment to JavaSE-1.6

5 files changed, 146 insertions, 17 deletions

diff --git a/org.eclipse.photran.cdtinterface/.classpath b/org.eclipse.photran.cdtinterface/.classpath
index 472ee29b..deb67366 100644
--- a/org.eclipse.photran.cdtinterface/.classpath
+++ b/org.eclipse.photran.cdtinterface/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.photran.cdtinterface/.settings/.api_filters b/org.eclipse.photran.cdtinterface/.settings/.api_filters
new file mode 100644
index 00000000..736db9e5
--- /dev/null
+++ b/org.eclipse.photran.cdtinterface/.settings/.api_filters
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.photran.cdtinterface" version="2">
+    <resource path="src/org/eclipse/photran/internal/core/model/FortranElement.java" type="org.eclipse.photran.internal.core.model.FortranElement">
+        <filter id="576720909">
+            <message_arguments>
+                <message_argument value="SourceManipulation"/>
+                <message_argument value="FortranElement"/>
+            </message_arguments>
+        </filter>
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="Parent"/>
+                <message_argument value="FortranElement"/>
+                <message_argument value="FortranElement(Parent)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/photran/internal/core/model/FortranElement.java" type="org.eclipse.photran.internal.core.model.FortranElement$BlockData">
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="Parent"/>
+                <message_argument value="BlockData"/>
+                <message_argument value="BlockData(Parent)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/photran/internal/core/model/FortranElement.java" type="org.eclipse.photran.internal.core.model.FortranElement$DerivedType">
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="Parent"/>
+                <message_argument value="DerivedType"/>
+                <message_argument value="DerivedType(Parent)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/photran/internal/core/model/FortranElement.java" type="org.eclipse.photran.internal.core.model.FortranElement$ErrorNode">
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="Parent"/>
+                <message_argument value="ErrorNode"/>
+                <message_argument value="ErrorNode(Parent, String)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/photran/internal/core/model/FortranElement.java" type="org.eclipse.photran.internal.core.model.FortranElement$Function">
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="Parent"/>
+                <message_argument value="Function"/>
+                <message_argument value="Function(Parent)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/photran/internal/core/model/FortranElement.java" type="org.eclipse.photran.internal.core.model.FortranElement$Interface">
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="Parent"/>
+                <message_argument value="Interface"/>
+                <message_argument value="Interface(Parent)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/photran/internal/core/model/FortranElement.java" type="org.eclipse.photran.internal.core.model.FortranElement$MainProgram">
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="Parent"/>
+                <message_argument value="MainProgram"/>
+                <message_argument value="MainProgram(Parent)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/photran/internal/core/model/FortranElement.java" type="org.eclipse.photran.internal.core.model.FortranElement$Module">
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="Parent"/>
+                <message_argument value="Module"/>
+                <message_argument value="Module(Parent)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/photran/internal/core/model/FortranElement.java" type="org.eclipse.photran.internal.core.model.FortranElement$Submodule">
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="Parent"/>
+                <message_argument value="Submodule"/>
+                <message_argument value="Submodule(Parent)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/photran/internal/core/model/FortranElement.java" type="org.eclipse.photran.internal.core.model.FortranElement$Subprogram">
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="Parent"/>
+                <message_argument value="Subprogram"/>
+                <message_argument value="Subprogram(Parent)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/photran/internal/core/model/FortranElement.java" type="org.eclipse.photran.internal.core.model.FortranElement$Subroutine">
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="Parent"/>
+                <message_argument value="Subroutine"/>
+                <message_argument value="Subroutine(Parent)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/photran/internal/core/model/FortranElement.java" type="org.eclipse.photran.internal.core.model.FortranElement$UnknownNode">
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="Parent"/>
+                <message_argument value="UnknownNode"/>
+                <message_argument value="UnknownNode(Parent, String)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="src/org/eclipse/photran/internal/core/model/FortranElement.java" type="org.eclipse.photran.internal.core.model.FortranElement$Variable">
+        <filter id="643850349">
+            <message_arguments>
+                <message_argument value="Parent"/>
+                <message_argument value="Variable"/>
+                <message_argument value="Variable(Parent)"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/org.eclipse.photran.cdtinterface/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.photran.cdtinterface/.settings/org.eclipse.jdt.core.prefs
index 0f087aef..d731d429 100644
--- a/org.eclipse.photran.cdtinterface/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.photran.cdtinterface/.settings/org.eclipse.jdt.core.prefs
@@ -1,9 +1,9 @@
-#Thu May 27 08:46:25 CDT 2010
+#Tue Nov 01 15:47:36 CDT 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -74,7 +74,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=20
@@ -146,9 +146,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
 org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
 org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
diff --git a/org.eclipse.photran.cdtinterface/META-INF/MANIFEST.MF b/org.eclipse.photran.cdtinterface/META-INF/MANIFEST.MF
index 7b671882..f8b1b83f 100644
--- a/org.eclipse.photran.cdtinterface/META-INF/MANIFEST.MF
+++ b/org.eclipse.photran.cdtinterface/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.photran.cdtinterface; singleton:=true
-Bundle-Version: 7.0.0.qualifier
+Bundle-Version: 8.0.0.qualifier
 Bundle-ClassPath: cdtinterface.jar
 Bundle-Activator: org.eclipse.photran.internal.cdtinterface.CDTInterfacePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.eclipse.photran.internal.cdtinterface,
- org.eclipse.photran.internal.cdtinterface.core,
- org.eclipse.photran.internal.cdtinterface.dom,
- org.eclipse.photran.internal.cdtinterface.errorparsers,
- org.eclipse.photran.internal.cdtinterface.launch,
- org.eclipse.photran.internal.cdtinterface.templates,
- org.eclipse.photran.internal.cdtinterface.ui,
- org.eclipse.photran.internal.cdtinterface.ui.editor,
+Export-Package: org.eclipse.photran.internal.cdtinterface;x-internal:=true,
+ org.eclipse.photran.internal.cdtinterface.core;x-friends:="org.eclipse.photran.ui,org.eclipse.photran.managedbuilder.core",
+ org.eclipse.photran.internal.cdtinterface.dom;x-internal:=true,
+ org.eclipse.photran.internal.cdtinterface.errorparsers;x-internal:=true,
+ org.eclipse.photran.internal.cdtinterface.launch;x-internal:=true,
+ org.eclipse.photran.internal.cdtinterface.templates;x-internal:=true,
+ org.eclipse.photran.internal.cdtinterface.ui;x-internal:=true,
+ org.eclipse.photran.internal.cdtinterface.ui.editor;x-friends:="org.eclipse.photran.ui",
  org.eclipse.photran.internal.core.model
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -41,4 +41,4 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.cdt.managedbuilder.core,
  org.eclipse.ui.navigator.resources
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/org.eclipse.photran.cdtinterface/pom.xml b/org.eclipse.photran.cdtinterface/pom.xml
index c7068cdb..1d7349b2 100644
--- a/org.eclipse.photran.cdtinterface/pom.xml
+++ b/org.eclipse.photran.cdtinterface/pom.xml
@@ -11,6 +11,6 @@
   </parent>
 
   <artifactId>org.eclipse.photran.cdtinterface</artifactId>
-  <version>7.0.0-SNAPSHOT</version>
+  <version>8.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>