Commits

Anonymous committed 80760c3

change to use eclipse.scada.chart

  • Participants
  • Parent commits c74c111
  • Branches 1.2

Comments (0)

Files changed (29)

File org.openscada.chart.ui.feature/feature.xml

    </license>
 
    <requires>
-      <import feature="org.openscada.infinity" version="1.0.0.qualifier"/>
+      <import feature="org.eclipse.scada.chart" version="0.1.0.qualifier"/>
    </requires>
 
    <plugin

File org.openscada.da.client.dataitem.details.chart/META-INF/MANIFEST.MF

  org.openscada.da.ui;bundle-version="1.0.0",
  org.openscada.da.ui.connection;bundle-version="1.0.0",
  org.eclipse.core.runtime;bundle-version="3.7.0",
- org.openscada.chart;bundle-version="1.0.0",
- org.openscada.chart.swt;bundle-version="1.0.0",
+ org.eclipse.scada.chart;bundle-version="0.1.0",
+ org.eclipse.scada.chart.swt;bundle-version="0.1.0",
  org.openscada.ui.chart;bundle-version="1.0.0",
  org.openscada.ui.chart.model;bundle-version="1.0.0",
  org.openscada.ui.utils;bundle-version="1.0.0"

File org.openscada.da.client.dataitem.details.chart/src/org/openscada/da/client/dataitem/details/chart/DetailsPart.java

 
 package org.openscada.da.client.dataitem.details.chart;
 
+import org.eclipse.scada.chart.swt.ChartArea;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.statushandlers.StatusManager;
-import org.openscada.chart.swt.ChartArea;
 import org.openscada.da.client.DataItemValue;
 import org.openscada.da.client.dataitem.details.VisibilityController;
 import org.openscada.da.ui.connection.data.DataItemHolder;

File org.openscada.ui.chart.view/META-INF/MANIFEST.MF

  org.eclipse.emf.edit.ui;bundle-version="2.7.0",
  org.openscada.ui.chart.model.edit;bundle-version="1.0.0",
  org.openscada.da.ui.widgets;bundle-version="1.0.0",
- org.openscada.chart;bundle-version="1.0.0",
- org.openscada.chart.swt;bundle-version="1.0.0",
+ org.eclipse.scada.chart;bundle-version="0.1.0",
+ org.eclipse.scada.chart.swt;bundle-version="0.1.0",
  org.eclipse.emf.databinding;bundle-version="1.2.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy

File org.openscada.ui.chart.view/src/org/openscada/ui/chart/view/ChartView.java

 /*
  * This file is part of the openSCADA project
+ * 
  * Copyright (C) 2006-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 import org.eclipse.jface.action.Separator;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.scada.chart.swt.ChartArea;
+import org.eclipse.scada.chart.swt.SWTGraphics;
 import org.eclipse.scada.utils.codec.Base64;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.ViewPart;
 import org.eclipse.ui.statushandlers.StatusManager;
-import org.openscada.chart.swt.ChartArea;
-import org.openscada.chart.swt.SWTGraphics;
 import org.openscada.da.ui.connection.data.Item;
 import org.openscada.ui.chart.model.ChartModel.Chart;
 import org.openscada.ui.chart.model.ChartModel.ChartPackage;

File org.openscada.ui.chart/META-INF/MANIFEST.MF

  org.openscada.ui.databinding;bundle-version="1.0.0",
  org.eclipse.scada.core;bundle-version="0.1.0",
  org.openscada.da.ui.widgets;bundle-version="1.0.0",
- org.openscada.chart;bundle-version="1.0.0",
- org.openscada.chart.swt;bundle-version="1.0.0",
+ org.eclipse.scada.chart;bundle-version="0.1.0",
+ org.eclipse.scada.chart.swt;bundle-version="0.1.0",
  org.eclipse.core.databinding;bundle-version="1.4.0",
  org.eclipse.core.databinding.beans;bundle-version="1.2.100",
  org.eclipse.core.databinding.observable;bundle-version="1.4.0",

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/AbstractAxisManager.java

 /*
  * This file is part of the openSCADA project
+ * 
  * Copyright (C) 2011-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 import org.eclipse.core.databinding.observable.list.ListDiff;
 import org.eclipse.core.databinding.observable.list.ListDiffVisitor;
 import org.eclipse.core.databinding.observable.list.WritableList;
-import org.openscada.chart.swt.ChartRenderer;
+import org.eclipse.scada.chart.swt.ChartRenderer;
 
 public abstract class AbstractAxisManager<Key, Value>
 {

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/AbstractAxisViewer.java

 /*
  * This file is part of the openSCADA project
+ * 
  * Copyright (C) 2011-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 package org.openscada.ui.chart.viewer;
 
 import org.eclipse.core.databinding.DataBindingContext;
-import org.openscada.chart.swt.ChartRenderer;
-import org.openscada.chart.swt.DisposeListener;
+import org.eclipse.scada.chart.swt.ChartRenderer;
+import org.eclipse.scada.chart.swt.DisposeListener;
 import org.openscada.ui.chart.model.ChartModel.Axis;
 
 public class AbstractAxisViewer extends AbstractObserver

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/ChartContext.java

 /*
  * This file is part of the openSCADA project
+ * 
  * Copyright (C) 2011-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 
 package org.openscada.ui.chart.viewer;
 
-import org.openscada.chart.swt.ChartRenderer;
+import org.eclipse.scada.chart.swt.ChartRenderer;
 import org.openscada.ui.chart.model.ChartModel.Chart;
 import org.openscada.ui.chart.model.ChartModel.XAxis;
 import org.openscada.ui.chart.model.ChartModel.YAxis;

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/ChartContextImpl.java

 /*
  * This file is part of the openSCADA project
+ * 
  * Copyright (C) 2011-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 
 package org.openscada.ui.chart.viewer;
 
-import org.openscada.chart.swt.ChartRenderer;
+import org.eclipse.scada.chart.swt.ChartRenderer;
 import org.openscada.ui.chart.model.ChartModel.Chart;
 import org.openscada.ui.chart.model.ChartModel.XAxis;
 import org.openscada.ui.chart.model.ChartModel.YAxis;

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/ChartViewer.java

  * 
  * Copyright (C) 2006-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
  * Copyright (C) 2013 Jens Reimann (ctron@dentrassi.de)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 import org.eclipse.jface.util.SafeRunnable;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.scada.chart.Realm;
+import org.eclipse.scada.chart.swt.ChartMouseListener.MouseState;
+import org.eclipse.scada.chart.swt.ChartRenderer;
+import org.eclipse.scada.chart.swt.DisplayRealm;
+import org.eclipse.scada.chart.swt.DisposeListener;
+import org.eclipse.scada.chart.swt.controller.MouseHover;
+import org.eclipse.scada.chart.swt.controller.MouseHover.Listener;
+import org.eclipse.scada.chart.swt.render.CurrentTimeRuler;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DropTargetAdapter;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Display;
-import org.openscada.chart.Realm;
-import org.openscada.chart.swt.ChartMouseListener.MouseState;
-import org.openscada.chart.swt.ChartRenderer;
-import org.openscada.chart.swt.DisplayRealm;
-import org.openscada.chart.swt.DisposeListener;
-import org.openscada.chart.swt.controller.MouseHover;
-import org.openscada.chart.swt.controller.MouseHover.Listener;
-import org.openscada.chart.swt.render.CurrentTimeRuler;
 import org.openscada.da.ui.connection.data.Item;
 import org.openscada.ui.chart.model.ChartModel.ArchiveSeries;
 import org.openscada.ui.chart.model.ChartModel.Chart;
 
     protected void updateState ()
     {
-        final org.openscada.chart.XAxis x;
-        final org.openscada.chart.YAxis y;
+        final org.eclipse.scada.chart.XAxis x;
+        final org.eclipse.scada.chart.YAxis y;
 
         x = getSelectedXAxisViewer ();
         y = getSelectedYAxisViewer ();
         this.timeRuler = null;
     }
 
-    private org.openscada.chart.YAxis getSelectedYAxisViewer ()
+    private org.eclipse.scada.chart.YAxis getSelectedYAxisViewer ()
     {
         return this.selectedYAxis != null ? this.selectedYAxis.getAxis () : null;
     }
 
-    private org.openscada.chart.XAxis getSelectedXAxisViewer ()
+    private org.eclipse.scada.chart.XAxis getSelectedXAxisViewer ()
     {
         return this.selectedXAxis != null ? this.selectedXAxis.getAxis () : null;
     }
 
     public void showTimespan ( final long duration, final TimeUnit timeUnit )
     {
-        final org.openscada.chart.XAxis x = getSelectedXAxisViewer ();
+        final org.eclipse.scada.chart.XAxis x = getSelectedXAxisViewer ();
         if ( x != null )
         {
             x.setByTimespan ( duration, timeUnit );
 
     public void pageTimespan ( final long duration, final TimeUnit timeUnit )
     {
-        final org.openscada.chart.XAxis x = getSelectedXAxisViewer ();
+        final org.eclipse.scada.chart.XAxis x = getSelectedXAxisViewer ();
         if ( x != null )
         {
             x.shiftByTimespan ( duration, timeUnit );
 
     public void setNowCenter ()
     {
-        final org.openscada.chart.XAxis x = getSelectedXAxisViewer ();
+        final org.eclipse.scada.chart.XAxis x = getSelectedXAxisViewer ();
         if ( x != null )
         {
             x.setNowCenter ();

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/XAxisManager.java

 /*
  * This file is part of the openSCADA project
+ * 
  * Copyright (C) 2011-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 import java.util.Map;
 
 import org.eclipse.core.databinding.DataBindingContext;
-import org.openscada.chart.swt.ChartRenderer;
+import org.eclipse.scada.chart.swt.ChartRenderer;
 import org.openscada.ui.chart.model.ChartModel.XAxis;
 
 public class XAxisManager extends AbstractAxisManager<XAxis, XAxisViewer>

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/XAxisViewer.java

 /*
  * This file is part of the openSCADA project
+ * 
  * Copyright (C) 2011-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 import org.eclipse.core.databinding.beans.BeansObservables;
 import org.eclipse.core.databinding.beans.PojoObservables;
 import org.eclipse.emf.databinding.EMFObservables;
+import org.eclipse.scada.chart.swt.ChartRenderer;
+import org.eclipse.scada.chart.swt.render.XAxisDynamicRenderer;
 import org.eclipse.swt.SWT;
-import org.openscada.chart.swt.ChartRenderer;
-import org.openscada.chart.swt.render.XAxisDynamicRenderer;
 import org.openscada.ui.chart.model.ChartModel.ChartPackage;
 import org.openscada.ui.chart.model.ChartModel.XAxis;
 
 {
     private final XAxis axis;
 
-    private final org.openscada.chart.XAxis control;
+    private final org.eclipse.scada.chart.XAxis control;
 
     private final XAxisDynamicRenderer renderer;
 
 
         this.axis = axis;
 
-        this.control = new org.openscada.chart.XAxis ();
+        this.control = new org.eclipse.scada.chart.XAxis ();
 
         this.renderer = new XAxisDynamicRenderer ( manager );
         this.renderer.setAxis ( this.control );
         addBinding ( this.dbc.bindValue ( PojoObservables.observeValue ( this.renderer, "textPadding" ), EMFObservables.observeValue ( this.axis, ChartPackage.Literals.AXIS__TEXT_PADDING ) ) ); //$NON-NLS-1$
     }
 
-    public org.openscada.chart.XAxis getAxis ()
+    public org.eclipse.scada.chart.XAxis getAxis ()
     {
         return this.control;
     }

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/YAxisManager.java

 /*
  * This file is part of the openSCADA project
+ * 
  * Copyright (C) 2011-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 import java.util.Map;
 
 import org.eclipse.core.databinding.DataBindingContext;
-import org.openscada.chart.swt.ChartRenderer;
+import org.eclipse.scada.chart.swt.ChartRenderer;
 import org.openscada.ui.chart.model.ChartModel.YAxis;
 
 public class YAxisManager extends AbstractAxisManager<YAxis, YAxisViewer>

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/YAxisViewer.java

 /*
  * This file is part of the openSCADA project
+ * 
  * Copyright (C) 2011-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 import org.eclipse.core.databinding.beans.BeansObservables;
 import org.eclipse.core.databinding.beans.PojoObservables;
 import org.eclipse.emf.databinding.EMFObservables;
+import org.eclipse.scada.chart.swt.ChartRenderer;
+import org.eclipse.scada.chart.swt.render.YAxisDynamicRenderer;
 import org.eclipse.swt.SWT;
-import org.openscada.chart.swt.ChartRenderer;
-import org.openscada.chart.swt.render.YAxisDynamicRenderer;
 import org.openscada.ui.chart.model.ChartModel.ChartPackage;
 import org.openscada.ui.chart.model.ChartModel.YAxis;
 
 {
     private final YAxis axis;
 
-    private final org.openscada.chart.YAxis control;
+    private final org.eclipse.scada.chart.YAxis control;
 
     private final YAxisDynamicRenderer renderer;
 
 
         this.axis = axis;
 
-        this.control = new org.openscada.chart.YAxis ();
+        this.control = new org.eclipse.scada.chart.YAxis ();
 
         this.renderer = new YAxisDynamicRenderer ( manager );
         this.renderer.setAxis ( this.control );
         this.renderer.dispose ();
     }
 
-    public org.openscada.chart.YAxis getAxis ()
+    public org.eclipse.scada.chart.YAxis getAxis ()
     {
         return this.control;
     }

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/controller/time/CurrentTimeChartController.java

 /*
  * This file is part of the openSCADA project
+ * 
  * Copyright (C) 2011-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 import org.eclipse.core.databinding.beans.PojoObservables;
 import org.eclipse.core.databinding.observable.Realm;
 import org.eclipse.emf.databinding.EMFObservables;
-import org.openscada.chart.XAxis;
+import org.eclipse.scada.chart.XAxis;
 import org.openscada.ui.chart.model.ChartModel.ChartPackage;
 import org.openscada.ui.chart.model.ChartModel.CurrentTimeController;
 import org.openscada.ui.chart.viewer.ChartContext;

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/controller/tools/MouseControllerImpl.java

 /*
  * This file is part of the openSCADA project
+ * 
  * Copyright (C) 2011-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.beans.PojoObservables;
 import org.eclipse.emf.databinding.EMFObservables;
-import org.openscada.chart.swt.controller.MouseDragZoomer;
-import org.openscada.chart.swt.controller.MouseTransformer;
-import org.openscada.chart.swt.controller.MouseWheelZoomer;
+import org.eclipse.scada.chart.swt.controller.MouseDragZoomer;
+import org.eclipse.scada.chart.swt.controller.MouseTransformer;
+import org.eclipse.scada.chart.swt.controller.MouseWheelZoomer;
 import org.openscada.ui.chart.model.ChartModel.Chart;
 import org.openscada.ui.chart.model.ChartModel.ChartPackage;
 import org.openscada.ui.chart.model.ChartModel.MouseController;
         ctx.bindValue ( PojoObservables.observeValue ( this, "selectedYAxis" ), EMFObservables.observeValue ( chart, ChartPackage.Literals.CHART__SELECTED_YAXIS ) ); //$NON-NLS-1$
     }
 
-    protected void activate ( final org.openscada.chart.XAxis x, final org.openscada.chart.YAxis y )
+    protected void activate ( final org.eclipse.scada.chart.XAxis x, final org.eclipse.scada.chart.YAxis y )
     {
         this.mouseTransformer = new MouseTransformer ( this.chartContext.getChartRenderer (), x, y );
         this.mouseDragZoomer = new MouseDragZoomer ( this.chartContext.getChartRenderer (), x, y );
 
     protected void updateState ()
     {
-        final org.openscada.chart.XAxis x;
-        final org.openscada.chart.YAxis y;
+        final org.eclipse.scada.chart.XAxis x;
+        final org.eclipse.scada.chart.YAxis y;
 
         x = getSelectedXAxisViewer ();
         y = getSelectedYAxisViewer ();
         }
     }
 
-    private org.openscada.chart.YAxis getSelectedYAxisViewer ()
+    private org.eclipse.scada.chart.YAxis getSelectedYAxisViewer ()
     {
         return this.selectedYAxis != null ? this.selectedYAxis.getAxis () : null;
     }
 
-    private org.openscada.chart.XAxis getSelectedXAxisViewer ()
+    private org.eclipse.scada.chart.XAxis getSelectedXAxisViewer ()
     {
         return this.selectedXAxis != null ? this.selectedXAxis.getAxis () : null;
     }

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/input/AbstractInput.java

 /*
  * This file is part of the openSCADA project
+ * 
  * Copyright (C) 2011-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 
 import java.util.Date;
 
+import org.eclipse.scada.chart.XAxis;
+import org.eclipse.scada.chart.swt.ChartMouseListener.MouseState;
+import org.eclipse.scada.chart.swt.ChartMouseMoveListener;
+import org.eclipse.scada.chart.swt.ChartRenderer;
 import org.eclipse.scada.utils.beans.AbstractPropertyChange;
 import org.eclipse.swt.graphics.Rectangle;
-import org.openscada.chart.XAxis;
-import org.openscada.chart.swt.ChartMouseListener.MouseState;
-import org.openscada.chart.swt.ChartMouseMoveListener;
-import org.openscada.chart.swt.ChartRenderer;
 import org.openscada.ui.chart.viewer.ChartViewer;
 
 public abstract class AbstractInput extends AbstractPropertyChange implements ChartInput

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/input/ArchiveChannelInput.java

 /*
  * This file is part of the openSCADA project
+ * 
  * Copyright (C) 2011-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 package org.openscada.ui.chart.viewer.input;
 
 import org.eclipse.jface.resource.ResourceManager;
-import org.openscada.chart.swt.render.AbstractLineRender;
-import org.openscada.chart.swt.render.StepRenderer;
+import org.eclipse.scada.chart.swt.render.AbstractLineRender;
+import org.eclipse.scada.chart.swt.render.StepRenderer;
 import org.openscada.ui.chart.viewer.ChartViewer;
 
 public class ArchiveChannelInput extends QueryInput

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/input/ArchiveInput.java

 /*
  * This file is part of the openSCADA project
+ * 
  * Copyright (C) 2011-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 package org.openscada.ui.chart.viewer.input;
 
 import org.eclipse.jface.resource.ResourceManager;
-import org.openscada.chart.swt.render.AbstractLineRender;
-import org.openscada.chart.swt.render.StepRenderer;
+import org.eclipse.scada.chart.swt.render.AbstractLineRender;
+import org.eclipse.scada.chart.swt.render.StepRenderer;
 import org.openscada.hd.ui.connection.data.Item;
 import org.openscada.ui.chart.viewer.ChartViewer;
 import org.slf4j.Logger;

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/input/ItemObserver.java

 /*
  * This file is part of the openSCADA project
+ * 
  * Copyright (C) 2006-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 import java.util.LinkedList;
 
 import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.scada.chart.DataEntry;
+import org.eclipse.scada.chart.Realm;
+import org.eclipse.scada.chart.WritableSeries;
+import org.eclipse.scada.chart.XAxis;
+import org.eclipse.scada.chart.YAxis;
+import org.eclipse.scada.chart.swt.ChartRenderer;
+import org.eclipse.scada.chart.swt.render.AbstractLineRender;
+import org.eclipse.scada.chart.swt.render.PositionYRuler;
+import org.eclipse.scada.chart.swt.render.StepRenderer;
 import org.eclipse.scada.core.Variant;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.LineAttributes;
 import org.eclipse.swt.widgets.Display;
-import org.openscada.chart.DataEntry;
-import org.openscada.chart.Realm;
-import org.openscada.chart.WritableSeries;
-import org.openscada.chart.XAxis;
-import org.openscada.chart.YAxis;
-import org.openscada.chart.swt.ChartRenderer;
-import org.openscada.chart.swt.render.AbstractLineRender;
-import org.openscada.chart.swt.render.PositionYRuler;
-import org.openscada.chart.swt.render.StepRenderer;
 import org.openscada.core.data.SubscriptionState;
 import org.openscada.da.client.DataItemValue;
 import org.openscada.da.ui.connection.data.DataItemHolder;

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/input/LineInput.java

 /*
  * This file is part of the openSCADA project
+ * 
  * Copyright (C) 2006-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 
 import org.eclipse.jface.resource.LocalResourceManager;
 import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.scada.chart.swt.render.AbstractLineRender;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.widgets.Display;
-import org.openscada.chart.swt.render.AbstractLineRender;
 
 public abstract class LineInput extends AbstractInput implements LinePropertiesSupporter
 {

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/input/QueryChannelSeriesData.java

 /*
  * This file is part of the openSCADA project
+ * 
  * Copyright (C) 2011-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 
 package org.openscada.ui.chart.viewer.input;
 
-import org.openscada.chart.AbstractSeriesData;
-import org.openscada.chart.Realm;
-import org.openscada.chart.SeriesDataListener;
-import org.openscada.chart.SeriesViewData;
-import org.openscada.chart.XAxis;
-import org.openscada.chart.YAxis;
+import org.eclipse.scada.chart.AbstractSeriesData;
+import org.eclipse.scada.chart.Realm;
+import org.eclipse.scada.chart.SeriesDataListener;
+import org.eclipse.scada.chart.SeriesViewData;
+import org.eclipse.scada.chart.XAxis;
+import org.eclipse.scada.chart.YAxis;
 import org.openscada.hd.ui.data.ServiceQueryBuffer;
 
 public class QueryChannelSeriesData extends AbstractSeriesData

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/input/QuerySeriesData.java

  * 
  * Copyright (C) 2011-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
  * Copyright (C) 2013 Jens Reimann (ctron@dentrassi.de)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 import java.util.Map;
 import java.util.Set;
 
+import org.eclipse.scada.chart.AbstractSeriesData;
+import org.eclipse.scada.chart.DataEntry;
+import org.eclipse.scada.chart.Realm;
+import org.eclipse.scada.chart.SeriesViewData;
+import org.eclipse.scada.chart.WritableSeriesData;
+import org.eclipse.scada.chart.XAxis;
+import org.eclipse.scada.chart.YAxis;
 import org.eclipse.scada.core.ConnectionInformation;
-import org.openscada.chart.AbstractSeriesData;
-import org.openscada.chart.DataEntry;
-import org.openscada.chart.Realm;
-import org.openscada.chart.SeriesViewData;
-import org.openscada.chart.WritableSeriesData;
-import org.openscada.chart.XAxis;
-import org.openscada.chart.YAxis;
 import org.openscada.core.connection.provider.ConnectionRequest;
 import org.openscada.hd.QueryListener;
 import org.openscada.hd.QueryState;

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/input/ScriptInput.java

 /*
  * This file is part of the openSCADA project
+ * 
  * Copyright (C) 2011-2012 TH4 SYSTEMS GmbH (http://th4-systems.com)
+ * Copyright (C) 2013 IBH SYSTEMS GmbH (http://ibh-systems.com)
  *
  * openSCADA is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License version 3
 import javax.script.SimpleScriptContext;
 
 import org.eclipse.jface.resource.ResourceManager;
+import org.eclipse.scada.chart.AsyncFunctionSeriesData;
+import org.eclipse.scada.chart.DataEntry;
+import org.eclipse.scada.chart.Realm;
+import org.eclipse.scada.chart.XAxis;
+import org.eclipse.scada.chart.YAxis;
+import org.eclipse.scada.chart.swt.render.AbstractLineRender;
+import org.eclipse.scada.chart.swt.render.StepRenderer;
 import org.eclipse.scada.utils.script.ScriptExecutor;
-import org.openscada.chart.AsyncFunctionSeriesData;
-import org.openscada.chart.DataEntry;
-import org.openscada.chart.Realm;
-import org.openscada.chart.XAxis;
-import org.openscada.chart.YAxis;
-import org.openscada.chart.swt.render.AbstractLineRender;
-import org.openscada.chart.swt.render.StepRenderer;
 import org.openscada.ui.chart.viewer.ChartViewer;
 
 public class ScriptInput extends LineInput

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/input/composite/CompositeQualityInput.java

 import org.eclipse.core.databinding.observable.list.ListDiff;
 import org.eclipse.core.databinding.observable.list.ListDiffVisitor;
 import org.eclipse.swt.graphics.Image;
-import org.openscada.chart.DataEntry;
-import org.openscada.chart.Realm;
-import org.openscada.chart.XAxis;
-import org.openscada.chart.YAxis;
-import org.openscada.chart.swt.ChartRenderer;
-import org.openscada.chart.swt.render.AbstractDataSeriesRenderer;
-import org.openscada.chart.swt.render.QualityRenderer;
+import org.eclipse.scada.chart.DataEntry;
+import org.eclipse.scada.chart.Realm;
+import org.eclipse.scada.chart.XAxis;
+import org.eclipse.scada.chart.YAxis;
+import org.eclipse.scada.chart.swt.ChartRenderer;
+import org.eclipse.scada.chart.swt.render.AbstractDataSeriesRenderer;
+import org.eclipse.scada.chart.swt.render.QualityRenderer;
 import org.openscada.ui.chart.viewer.ChartViewer;
 import org.openscada.ui.chart.viewer.input.AbstractInput;
 import org.openscada.ui.chart.viewer.input.ArchiveInput;

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/input/composite/CompositeSource.java

 
 package org.openscada.ui.chart.viewer.input.composite;
 
-import org.openscada.chart.SeriesDataListener;
-import org.openscada.chart.SeriesViewData;
+import org.eclipse.scada.chart.SeriesDataListener;
+import org.eclipse.scada.chart.SeriesViewData;
 import org.openscada.ui.chart.viewer.input.ArchiveInput;
 import org.openscada.ui.chart.viewer.input.QuerySeriesData;
 import org.slf4j.Logger;

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/input/composite/MergeQualityData.java

 import java.util.Collection;
 import java.util.NavigableSet;
 
-import org.openscada.chart.DataEntry;
-import org.openscada.chart.SeriesViewData;
-import org.openscada.chart.WritableSeriesData;
+import org.eclipse.scada.chart.DataEntry;
+import org.eclipse.scada.chart.SeriesViewData;
+import org.eclipse.scada.chart.WritableSeriesData;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.profiler.Profiler;

File org.openscada.ui.chart/src/org/openscada/ui/chart/viewer/input/composite/MergedSeries.java

 
 import java.util.Map;
 
-import org.openscada.chart.Realm;
-import org.openscada.chart.WritableSeries;
-import org.openscada.chart.XAxis;
-import org.openscada.chart.YAxis;
+import org.eclipse.scada.chart.Realm;
+import org.eclipse.scada.chart.WritableSeries;
+import org.eclipse.scada.chart.XAxis;
+import org.eclipse.scada.chart.YAxis;
 import org.openscada.ui.chart.viewer.input.ArchiveInput;
 
 public class MergedSeries extends WritableSeries