Renamed plotViewerTopComponent to conform with naming conventions. Added...

.gitignore

@@ -7,4 +7,9 @@
 /RNb/Navigator/build/
 /RNb/Language/build/
 /RNb/Project/build/
-/RNb/Analyzer/nbproject/private/
+/RNb/Analyzer/nbproject/private/
+/nbproject/private/
+/build/
+/RNb/Execution/nbproject/private/
+/RNb/REngine/build/
+/RNb/RServe/build/

RNb/Execution/src/org/netbeans/r/execution/ReditorRunnable.java

@@ -16,7 +16,7 @@
 import org.netbeans.api.progress.ProgressHandle;
 import org.netbeans.api.progress.ProgressHandleFactory;
 import org.netbeans.r.options.RconfigurationPanel;
-import org.netbeans.r.pdfviewer.plotViewerTopComponent;
+import org.netbeans.r.pdfviewer.PlotViewerTopComponent;
 import org.openide.ErrorManager;
 import org.openide.execution.NbProcessDescriptor;
 import org.openide.filesystems.FileObject;
@@ -39,7 +39,7 @@ public class ReditorRunnable implements Runnable {
     private String Rexecutable = NbPreferences.forModule(RconfigurationPanel.class).get("RConfiguration.path", "");
     private int executionStatus;
     private String fileExecuted;
-    private final plotViewerTopComponent win = plotViewerTopComponent.findInstance();
+    private final PlotViewerTopComponent win = PlotViewerTopComponent.findInstance();
 
     public ReditorRunnable(DataObject dataObject, String commandLineArgs) {
         this.dataObject = dataObject;

RNb/Execution/src/org/netbeans/r/pdfviewer/plotViewerTopComponent.java → RNb/Execution/src/org/netbeans/r/pdfviewer/PlotViewerTopComponent.java

@@ -14,27 +14,27 @@
         autostore = false
 )
 @TopComponent.Description(
-        preferredID = "plotViewerTopComponent",
+        preferredID = "PlotViewerTopComponent",
         //iconBase="SET/PATH/TO/ICON/HERE", 
         persistenceType = TopComponent.PERSISTENCE_ALWAYS
 )
 @TopComponent.Registration(mode = "editor", openAtStartup = false)
-@ActionID(category = "Window", id = "org.netbeans.pdfviewer.plotViewerTopComponent")
+@ActionID(category = "Window", id = "org.netbeans.pdfviewer.PlotViewerTopComponent")
 @ActionReference(path = "Menu/Window" /*, position = 333 */)
 @TopComponent.OpenActionRegistration(
-        displayName = "#CTL_plotViewerAction",
-        preferredID = "plotViewerTopComponent"
+        displayName = "#CTL_PlotViewerAction",
+        preferredID = "PlotViewerTopComponent"
 )
 @Messages({
-    "CTL_plotViewerAction=plotViewer",
-    "CTL_plotViewerTopComponent=Graphic",
-    "HINT_plotViewerTopComponent=This is a plot window"
+    "CTL_PlotViewerAction=PlotViewer",
+    "CTL_PlotViewerTopComponent=Graphic",
+    "HINT_PlotViewerTopComponent=This is a plot window"
 })
-public final class plotViewerTopComponent extends TopComponent {
+public final class PlotViewerTopComponent extends TopComponent {
 
-    private static plotViewerTopComponent instance;
+    private static PlotViewerTopComponent instance;
 
-    public plotViewerTopComponent() {
+    public PlotViewerTopComponent() {
         initComponents();
         setName(Bundle.CTL_plotViewerTopComponent());
 //        setToolTipText(Bundle.HINT_plotViewerTopComponent());
@@ -87,9 +87,9 @@ void readProperties(java.util.Properties p) {
         // TODO read your settings according to their version
     }
 
-    public static plotViewerTopComponent findInstance() {
+    public static PlotViewerTopComponent findInstance() {
         if (instance == null) {
-            instance = new plotViewerTopComponent();
+            instance = new PlotViewerTopComponent();
             return instance;
         }
         return instance;

RNb/Options/src/org/netbeans/r/options/RconfigurationOptionsPanelController.java

@@ -10,7 +10,7 @@
 @OptionsPanelController.SubRegistration(location = "R",
 displayName = "#AdvancedOption_DisplayName_Rconfiguration",
 keywords = "#AdvancedOption_Keywords_Rconfiguration",
-keywordsCategory = "R/Rconfiguration")
+keywordsCategory = "R/Rconfiguration", position=0)
 public final class RconfigurationOptionsPanelController extends OptionsPanelController {
 
     private RconfigurationPanel panel;

RNb/REngine/build.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
+<!-- for some information on what you could do (e.g. targets to override). -->
+<!-- If you delete this file and reopen the project it will be recreated. -->
+<project name="org.netbeans.r.rengine" default="netbeans" basedir=".">
+    <description>Builds, tests, and runs the project org.netbeans.r.rengine.</description>
+    <import file="nbproject/build-impl.xml"/>
+</project>

RNb/REngine/manifest.mf

@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+OpenIDE-Module: org.netbeans.r.rengine
+OpenIDE-Module-Localizing-Bundle: org/netbeans/r/rengine/Bundle.properties
+OpenIDE-Module-Provides: REngine
+OpenIDE-Module-Specification-Version: 1.0
+

RNb/REngine/nbproject/build-impl.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+-->
+<project name="org.netbeans.r.rengine-impl" basedir="..">
+    <fail message="Please build using Ant 1.7.1 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.7.1"/>
+            </not>
+        </condition>
+    </fail>
+    <property file="nbproject/private/suite-private.properties"/>
+    <property file="nbproject/suite.properties"/>
+    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
+    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
+    <property file="${suite.dir}/nbproject/platform.properties"/>
+    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
+        <attribute name="name"/>
+        <attribute name="value"/>
+        <sequential>
+            <property name="@{name}" value="${@{value}}"/>
+        </sequential>
+    </macrodef>
+    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
+        <attribute name="property"/>
+        <attribute name="value"/>
+        <sequential>
+            <property name="@{property}" value="@{value}"/>
+        </sequential>
+    </macrodef>
+    <property file="${user.properties.file}"/>
+    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
+        <condition>
+            <not>
+                <contains string="${cluster.path.evaluated}" substring="platform"/>
+            </not>
+        </condition>
+    </fail>
+    <import file="${harness.dir}/build.xml"/>
+</project>

RNb/REngine/nbproject/genfiles.properties

@@ -0,0 +1,8 @@
+build.xml.data.CRC32=f33f2933
+build.xml.script.CRC32=6a81b4f8
+[email protected]
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=f33f2933
+nbproject/build-impl.xml.script.CRC32=5ce37f4b
+nbproject/[email protected]

RNb/REngine/nbproject/project.properties

@@ -0,0 +1,6 @@
+file.reference.REngine.jar=release/modules/ext/REngine.jar
+javac.source=1.6
+javac.compilerargs=-Xlint -Xlint:-serial
+license.file=../../../../../home/hoffmann/Downloads/lgpl-2.1.txt
+nbm.homepage=https://github.com/s-u/REngine
+nbm.module.author=Nils Hoffmann, Simon Urbanek

RNb/REngine/nbproject/project.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
+            <code-name-base>org.netbeans.r.rengine</code-name-base>
+            <suite-component/>
+            <module-dependencies/>
+            <public-packages>
+                <package>org.rosuda.REngine</package>
+            </public-packages>
+            <class-path-extension>
+                <runtime-relative-path>ext/REngine.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/REngine.jar</binary-origin>
+            </class-path-extension>
+        </data>
+    </configuration>
+</project>

RNb/REngine/nbproject/suite.properties

@@ -0,0 +1 @@
+suite.dir=${basedir}/..

RNb/REngine/src/org/netbeans/r/rengine/Bundle.properties

@@ -0,0 +1,5 @@
+OpenIDE-Module-Display-Category=Libraries
+OpenIDE-Module-Long-Description=\
+    Provides the REngine API for accessing R sessions via rJava or RServe
+OpenIDE-Module-Name=REngine
+OpenIDE-Module-Short-Description=Provides the REngine API for accessing R sessions via rJava or RServe

RNb/RServe/build.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- You may freely edit this file. See harness/README in the NetBeans platform -->
+<!-- for some information on what you could do (e.g. targets to override). -->
+<!-- If you delete this file and reopen the project it will be recreated. -->
+<project name="org.netbeans.r.rserve" default="netbeans" basedir=".">
+    <description>Builds, tests, and runs the project org.netbeans.r.rserve.</description>
+    <import file="nbproject/build-impl.xml"/>
+</project>

RNb/RServe/manifest.mf

@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+OpenIDE-Module: org.netbeans.r.rserve
+OpenIDE-Module-Localizing-Bundle: org/netbeans/r/rserve/Bundle.properties
+OpenIDE-Module-Provides: RServe
+OpenIDE-Module-Requires: REngine
+OpenIDE-Module-Specification-Version: 1.0
+

RNb/RServe/nbproject/build-impl.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+*** GENERATED FROM project.xml - DO NOT EDIT  ***
+***         EDIT ../build.xml INSTEAD         ***
+-->
+<project name="org.netbeans.r.rserve-impl" basedir="..">
+    <fail message="Please build using Ant 1.7.1 or higher.">
+        <condition>
+            <not>
+                <antversion atleast="1.7.1"/>
+            </not>
+        </condition>
+    </fail>
+    <property file="nbproject/private/suite-private.properties"/>
+    <property file="nbproject/suite.properties"/>
+    <fail unless="suite.dir">You must set 'suite.dir' to point to your containing module suite</fail>
+    <property file="${suite.dir}/nbproject/private/platform-private.properties"/>
+    <property file="${suite.dir}/nbproject/platform.properties"/>
+    <macrodef name="property" uri="http://www.netbeans.org/ns/nb-module-project/2">
+        <attribute name="name"/>
+        <attribute name="value"/>
+        <sequential>
+            <property name="@{name}" value="${@{value}}"/>
+        </sequential>
+    </macrodef>
+    <macrodef name="evalprops" uri="http://www.netbeans.org/ns/nb-module-project/2">
+        <attribute name="property"/>
+        <attribute name="value"/>
+        <sequential>
+            <property name="@{property}" value="@{value}"/>
+        </sequential>
+    </macrodef>
+    <property file="${user.properties.file}"/>
+    <nbmproject2:property name="harness.dir" value="nbplatform.${nbplatform.active}.harness.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <nbmproject2:property name="nbplatform.active.dir" value="nbplatform.${nbplatform.active}.netbeans.dest.dir" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <nbmproject2:evalprops property="cluster.path.evaluated" value="${cluster.path}" xmlns:nbmproject2="http://www.netbeans.org/ns/nb-module-project/2"/>
+    <fail message="Path to 'platform' cluster missing in $${cluster.path} property or using corrupt Netbeans Platform (missing harness).">
+        <condition>
+            <not>
+                <contains string="${cluster.path.evaluated}" substring="platform"/>
+            </not>
+        </condition>
+    </fail>
+    <import file="${harness.dir}/build.xml"/>
+</project>

RNb/RServe/nbproject/genfiles.properties

@@ -0,0 +1,8 @@
+build.xml.data.CRC32=b5b92905
+build.xml.script.CRC32=aa69d1d1
+[email protected]
+# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
+# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
+nbproject/build-impl.xml.data.CRC32=b5b92905
+nbproject/build-impl.xml.script.CRC32=e99e0f6c
+nbproject/[email protected]

RNb/RServe/nbproject/project.properties

@@ -0,0 +1,6 @@
+file.reference.Rserve.jar=release/modules/ext/Rserve.jar
+javac.source=1.6
+javac.compilerargs=-Xlint -Xlint:-serial
+license.file=../../../../../home/hoffmann/Downloads/lgpl-2.1.txt
+nbm.homepage=https://github.com/s-u/Rserve
+nbm.module.author=Nils Hoffmann, Simon Urbanek

RNb/RServe/nbproject/project.xml

@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.apisupport.project</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
+            <code-name-base>org.netbeans.r.rserve</code-name-base>
+            <suite-component/>
+            <module-dependencies>
+                <dependency>
+                    <code-name-base>org.netbeans.api.progress</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.37.1</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.keyring</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>1.19.1</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.modules.options.api</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.39.1</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.netbeans.r.rengine</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>1.0</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.awt</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>7.61.1</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.dialogs</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>7.36.1</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.util</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>8.37.1</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
+                    <code-name-base>org.openide.util.lookup</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <specification-version>8.24.1</specification-version>
+                    </run-dependency>
+                </dependency>
+            </module-dependencies>
+            <public-packages>
+                <package>org.rosuda.REngine.Rserve</package>
+                <package>org.rosuda.REngine.Rserve.protocol</package>
+            </public-packages>
+            <class-path-extension>
+                <runtime-relative-path>ext/Rserve.jar</runtime-relative-path>
+                <binary-origin>release/modules/ext/Rserve.jar</binary-origin>
+            </class-path-extension>
+        </data>
+    </configuration>
+</project>

RNb/RServe/nbproject/suite.properties

@@ -0,0 +1 @@
+suite.dir=${basedir}/..

RNb/RServe/src/org/netbeans/r/rserve/Bundle.properties

@@ -0,0 +1,5 @@
+OpenIDE-Module-Display-Category=Libraries
+OpenIDE-Module-Long-Description=\
+    Provides Rserve integration to access R remotely via TCP/IP
+OpenIDE-Module-Name=Rserve
+OpenIDE-Module-Short-Description=Provides Rserve integration to access R remotely via TCP/IP