diff --git a/.gitattributes b/.gitattributes
index ed02d06f7fba857bc41ae2baf9742fe35fb2700e..7296fdf778315518640ff1d42e26f93ceb13e638 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -144,6 +144,7 @@ Demo/CEP/TFlopCorrelator/TFC_GUI/plot2.png -text
 Demo/CEP/TFlopCorrelator/TFC_GUI/plot3.png -text
 Demo/CEP/TFlopCorrelator/TFC_GUI/src/tfc_gui/startTFC.sh -text svneol=native#application/octet-stream
 Demo/CEP/TFlopCorrelator/TFC_GUI/startTFC.sh -text svneol=native#application/octet-stream
+JAVA/GUI/Plotter/.cvsignore -text
 JAVA/GUI/Plotter/nbproject/.cvsignore -text
 LCS/AMC/amc_main_classes.png -text
 LCS/AMC/amc_package.png -text
diff --git a/.gitignore b/.gitignore
index 27a134b48a3c69783b558e54d5a664f09010ae91..5667c9edbf247539ee3ba77d50ea99d26d638bbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+JAVA/GUI/Plotter/build
+JAVA/GUI/Plotter/dist
 JAVA/GUI/Plotter/nbproject/private
 MAC/Navigator/panels/nav_fw/test.pnl
 SAS/OTB/MoM-OTDB-adapter/bin
diff --git a/JAVA/GUI/Plotter/.cvsignore b/JAVA/GUI/Plotter/.cvsignore
new file mode 100644
index 0000000000000000000000000000000000000000..9d0b71a3c79d2d3afbfa99269fea4280f5e73344
--- /dev/null
+++ b/JAVA/GUI/Plotter/.cvsignore
@@ -0,0 +1,2 @@
+build
+dist
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlot.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlot.java
new file mode 100644
index 0000000000000000000000000000000000000000..05b36b0e9465b81e56431a8587ead2db6d76ec2c
--- /dev/null
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/IPlot.java
@@ -0,0 +1,36 @@
+/*
+ * IPlot.java
+ *
+ * Copyright (C) 2006
+ * ASTRON (Netherlands Foundation for Research in Astronomy)
+ * P.O. Box 2, 7990AA Dwingeloo, The Netherlands, seg@astron.nl
+ *
+ */
+
+package nl.astron.lofar.sas.plotter;
+
+import java.util.HashMap;
+import javax.swing.JComponent;
+
+/**
+ * @version $Id$
+ * @created 11-04-2006, 15:00
+ * @author pompert
+ */
+public interface IPlot {
+
+	public static final int BAR = 1;
+	public static final int XYLINE = 2;
+	public static final int SCATTER = 3;
+	public static final int GRID = 4;
+	
+	/**
+	 * @param type
+	 * @param name
+	 * @param data
+	 * 
+	 */
+	public JComponent createPlot(int type, String name, HashMap data);
+
+}
+
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotController.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotController.java
new file mode 100644
index 0000000000000000000000000000000000000000..6da41d0eea538785a6c8119b446fd702e0ae630f
--- /dev/null
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotController.java
@@ -0,0 +1,68 @@
+/*
+ * PlotController.java
+ *
+ * Copyright (C) 2006
+ * ASTRON (Netherlands Foundation for Research in Astronomy)
+ * P.O. Box 2, 7990AA Dwingeloo, The Netherlands, seg@astron.nl
+ *
+ */
+
+package nl.astron.lofar.sas.plotter;
+
+import java.awt.Image;
+import java.util.Map;
+import javax.swing.JComponent;
+
+/**
+ * @created 11-04-2006, 15:00
+ * @author pompert
+ * @version $Id$
+ * @updated 12-apr-2006 15:15:03
+ */
+public class PlotController{
+
+	public PlotDataManager m_LOFARDataManager;
+	public PlotGroup m_PlotGroup;
+	public IPlot m_IPlot;
+	
+	public PlotController(){
+
+	}
+
+	public void finalize() throws Throwable {
+
+	}
+
+	/**
+	 * @param constraint
+	 * 
+	 */
+	public JComponent createPlot(String constraint){
+		return null;
+	}
+
+	/**
+	 * @param constraint
+	 * 
+	 */
+	public Image createPlotImage(String constraint){
+		return null;
+	}
+
+	/**
+	 * @param data
+	 * 
+	 */
+	public void exportRoot(Map data){
+
+	}
+
+	/**
+	 * @param data
+	 * 
+	 */
+	public JComponent modifyPlot(Map data){
+		return null;
+	}
+
+}
\ No newline at end of file
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotDataManager.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotDataManager.java
new file mode 100644
index 0000000000000000000000000000000000000000..9c3a8ee270ad07a5c75ea7658208397fea225a11
--- /dev/null
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotDataManager.java
@@ -0,0 +1,48 @@
+/*
+ * PlotDataManager.java
+ *
+ * Copyright (C) 2006
+ * ASTRON (Netherlands Foundation for Research in Astronomy)
+ * P.O. Box 2, 7990AA Dwingeloo, The Netherlands, seg@astron.nl
+ *
+ */
+
+package nl.astron.lofar.sas.plotter;
+
+import java.util.HashMap;
+
+/**
+ * @version $Id$
+ * @created 11-04-2006, 15:00
+ * @author pompert
+ */
+public class PlotDataManager {
+
+	//public ParmDB m_ParmDB;
+
+	public PlotDataManager(){
+
+	}
+
+	public void finalize() throws Throwable {
+
+	}
+
+	/**
+	 * @param constraint
+	 * 
+	 */
+	public HashMap retrieveData(String constraint){
+		return null;
+	}
+
+	/**
+	 * @param rootParams
+	 * @param data
+	 * 
+	 */
+	public void exportRoot(String[] rootParams, HashMap data){
+
+	}
+
+}
\ No newline at end of file
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotGroup.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotGroup.java
new file mode 100644
index 0000000000000000000000000000000000000000..36c3848d4cbf3efb798d0bda7bb061e259cf70d8
--- /dev/null
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotGroup.java
@@ -0,0 +1,32 @@
+/*
+ * PlotGroup.java
+ *
+ * Copyright (C) 2006
+ * ASTRON (Netherlands Foundation for Research in Astronomy)
+ * P.O. Box 2, 7990AA Dwingeloo, The Netherlands, seg@astron.nl
+ *
+ */
+
+package nl.astron.lofar.sas.plotter;
+
+import java.util.HashSet;
+
+/**
+ * @created 12-04-2006, 15:00
+ * @author pompert
+ * @version $Id$
+ * @updated 12-apr-2006 15:18:39
+ */
+public class PlotGroup{
+
+	public HashSet<IPlot> m_IPlot;
+
+	public PlotGroup(){
+
+	}
+
+	public void finalize() throws Throwable {
+
+	}
+
+}
\ No newline at end of file
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotPanel.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotPanel.java
new file mode 100644
index 0000000000000000000000000000000000000000..20c5c9bd711ed9b2a51e804b7643f429eafa2880
--- /dev/null
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/java/gui/plotter/PlotPanel.java
@@ -0,0 +1,53 @@
+/*
+ * PlotPanel.java
+ *
+ * Copyright (C) 2006
+ * ASTRON (Netherlands Foundation for Research in Astronomy)
+ * P.O. Box 2, 7990AA Dwingeloo, The Netherlands, seg@astron.nl
+ *
+ */
+
+package nl.astron.lofar.sas.plotter;
+
+import java.awt.Image;
+import java.awt.PrintJob;
+import javax.swing.JComponent;
+
+/**
+ * @version $Id$
+ * @created 11-04-2006, 15:00
+ * @author pompert
+ */
+public class PlotPanel {
+
+	public PlotController m_PlotController;
+
+	public PlotPanel(){
+
+	}
+
+	public void finalize() throws Throwable {
+
+	}
+
+	public JComponent createPlot(String constraint){
+		return null;
+	}
+
+	public Image exportImage(){
+		return null;
+	}
+
+	public void exportRoot(){
+
+	}
+
+	public void modifyDataSelection(){
+
+	}
+
+	public PrintJob printPlot(){
+		return null;
+	}
+
+}
\ No newline at end of file
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/IPlot.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/IPlot.java
new file mode 100644
index 0000000000000000000000000000000000000000..05b36b0e9465b81e56431a8587ead2db6d76ec2c
--- /dev/null
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/IPlot.java
@@ -0,0 +1,36 @@
+/*
+ * IPlot.java
+ *
+ * Copyright (C) 2006
+ * ASTRON (Netherlands Foundation for Research in Astronomy)
+ * P.O. Box 2, 7990AA Dwingeloo, The Netherlands, seg@astron.nl
+ *
+ */
+
+package nl.astron.lofar.sas.plotter;
+
+import java.util.HashMap;
+import javax.swing.JComponent;
+
+/**
+ * @version $Id$
+ * @created 11-04-2006, 15:00
+ * @author pompert
+ */
+public interface IPlot {
+
+	public static final int BAR = 1;
+	public static final int XYLINE = 2;
+	public static final int SCATTER = 3;
+	public static final int GRID = 4;
+	
+	/**
+	 * @param type
+	 * @param name
+	 * @param data
+	 * 
+	 */
+	public JComponent createPlot(int type, String name, HashMap data);
+
+}
+
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/PlotController.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/PlotController.java
new file mode 100644
index 0000000000000000000000000000000000000000..6da41d0eea538785a6c8119b446fd702e0ae630f
--- /dev/null
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/PlotController.java
@@ -0,0 +1,68 @@
+/*
+ * PlotController.java
+ *
+ * Copyright (C) 2006
+ * ASTRON (Netherlands Foundation for Research in Astronomy)
+ * P.O. Box 2, 7990AA Dwingeloo, The Netherlands, seg@astron.nl
+ *
+ */
+
+package nl.astron.lofar.sas.plotter;
+
+import java.awt.Image;
+import java.util.Map;
+import javax.swing.JComponent;
+
+/**
+ * @created 11-04-2006, 15:00
+ * @author pompert
+ * @version $Id$
+ * @updated 12-apr-2006 15:15:03
+ */
+public class PlotController{
+
+	public PlotDataManager m_LOFARDataManager;
+	public PlotGroup m_PlotGroup;
+	public IPlot m_IPlot;
+	
+	public PlotController(){
+
+	}
+
+	public void finalize() throws Throwable {
+
+	}
+
+	/**
+	 * @param constraint
+	 * 
+	 */
+	public JComponent createPlot(String constraint){
+		return null;
+	}
+
+	/**
+	 * @param constraint
+	 * 
+	 */
+	public Image createPlotImage(String constraint){
+		return null;
+	}
+
+	/**
+	 * @param data
+	 * 
+	 */
+	public void exportRoot(Map data){
+
+	}
+
+	/**
+	 * @param data
+	 * 
+	 */
+	public JComponent modifyPlot(Map data){
+		return null;
+	}
+
+}
\ No newline at end of file
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/PlotDataManager.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/PlotDataManager.java
new file mode 100644
index 0000000000000000000000000000000000000000..9c3a8ee270ad07a5c75ea7658208397fea225a11
--- /dev/null
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/PlotDataManager.java
@@ -0,0 +1,48 @@
+/*
+ * PlotDataManager.java
+ *
+ * Copyright (C) 2006
+ * ASTRON (Netherlands Foundation for Research in Astronomy)
+ * P.O. Box 2, 7990AA Dwingeloo, The Netherlands, seg@astron.nl
+ *
+ */
+
+package nl.astron.lofar.sas.plotter;
+
+import java.util.HashMap;
+
+/**
+ * @version $Id$
+ * @created 11-04-2006, 15:00
+ * @author pompert
+ */
+public class PlotDataManager {
+
+	//public ParmDB m_ParmDB;
+
+	public PlotDataManager(){
+
+	}
+
+	public void finalize() throws Throwable {
+
+	}
+
+	/**
+	 * @param constraint
+	 * 
+	 */
+	public HashMap retrieveData(String constraint){
+		return null;
+	}
+
+	/**
+	 * @param rootParams
+	 * @param data
+	 * 
+	 */
+	public void exportRoot(String[] rootParams, HashMap data){
+
+	}
+
+}
\ No newline at end of file
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/PlotGroup.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/PlotGroup.java
new file mode 100644
index 0000000000000000000000000000000000000000..36c3848d4cbf3efb798d0bda7bb061e259cf70d8
--- /dev/null
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/PlotGroup.java
@@ -0,0 +1,32 @@
+/*
+ * PlotGroup.java
+ *
+ * Copyright (C) 2006
+ * ASTRON (Netherlands Foundation for Research in Astronomy)
+ * P.O. Box 2, 7990AA Dwingeloo, The Netherlands, seg@astron.nl
+ *
+ */
+
+package nl.astron.lofar.sas.plotter;
+
+import java.util.HashSet;
+
+/**
+ * @created 12-04-2006, 15:00
+ * @author pompert
+ * @version $Id$
+ * @updated 12-apr-2006 15:18:39
+ */
+public class PlotGroup{
+
+	public HashSet<IPlot> m_IPlot;
+
+	public PlotGroup(){
+
+	}
+
+	public void finalize() throws Throwable {
+
+	}
+
+}
\ No newline at end of file
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/PlotPanel.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/PlotPanel.java
new file mode 100644
index 0000000000000000000000000000000000000000..20c5c9bd711ed9b2a51e804b7643f429eafa2880
--- /dev/null
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/PlotPanel.java
@@ -0,0 +1,53 @@
+/*
+ * PlotPanel.java
+ *
+ * Copyright (C) 2006
+ * ASTRON (Netherlands Foundation for Research in Astronomy)
+ * P.O. Box 2, 7990AA Dwingeloo, The Netherlands, seg@astron.nl
+ *
+ */
+
+package nl.astron.lofar.sas.plotter;
+
+import java.awt.Image;
+import java.awt.PrintJob;
+import javax.swing.JComponent;
+
+/**
+ * @version $Id$
+ * @created 11-04-2006, 15:00
+ * @author pompert
+ */
+public class PlotPanel {
+
+	public PlotController m_PlotController;
+
+	public PlotPanel(){
+
+	}
+
+	public void finalize() throws Throwable {
+
+	}
+
+	public JComponent createPlot(String constraint){
+		return null;
+	}
+
+	public Image exportImage(){
+		return null;
+	}
+
+	public void exportRoot(){
+
+	}
+
+	public void modifyDataSelection(){
+
+	}
+
+	public PrintJob printPlot(){
+		return null;
+	}
+
+}
\ No newline at end of file
diff --git a/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/SGTPlot.java b/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/SGTPlot.java
new file mode 100644
index 0000000000000000000000000000000000000000..175fcba8606dab001e9366b3d224cd12ee763a66
--- /dev/null
+++ b/JAVA/GUI/Plotter/src/nl/astron/lofar/sas/plotter/SGTPlot.java
@@ -0,0 +1,29 @@
+/*
+ * SGTPlot.java
+ *
+ * Copyright (C) 2006
+ * ASTRON (Netherlands Foundation for Research in Astronomy)
+ * P.O. Box 2, 7990AA Dwingeloo, The Netherlands, seg@astron.nl
+ *
+ */
+
+package nl.astron.lofar.sas.plotter;
+
+import java.util.HashMap;
+import javax.swing.JComponent;
+
+/**
+ * @version $Id$
+ * @created 11-04-2006, 15:00
+ * @author pompert
+ */
+public class SGTPlot implements IPlot {
+
+	public SGTPlot(){
+
+	}
+	public JComponent createPlot(int type, String name, HashMap data){
+	 return null;
+	}
+
+}
\ No newline at end of file