diff options
author | Markus Knauer | 2012-07-25 08:24:06 +0000 |
---|---|---|
committer | Markus Knauer | 2012-07-25 08:24:06 +0000 |
commit | 5b49d0c37094901c674d812598f8b1f9ef2235fd (patch) | |
tree | 04c5245a0255aa95795a38c805802946b535a617 | |
parent | f3450ac172061ce7340ab383a2b61ffd15f0f899 (diff) | |
download | org.eclipse.rap.incubator.visualization-5b49d0c37094901c674d812598f8b1f9ef2235fd.tar.gz org.eclipse.rap.incubator.visualization-5b49d0c37094901c674d812598f8b1f9ef2235fd.tar.xz org.eclipse.rap.incubator.visualization-5b49d0c37094901c674d812598f8b1f9ef2235fd.zip |
Adjust Java imports to RAP Runtime 2.0.
* Organize imports to reflect the changes in RAP 2.0 with the move
from org.eclipse.rwt to org.eclipse.rap.rwt
* Change MANIFEST.MF requirements where versions where specified before.
13 files changed, 36 insertions, 41 deletions
diff --git a/bundles/org.eclipse.rap.rwt.excanvas/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.rwt.excanvas/META-INF/MANIFEST.MF index 272c9f7..82713c1 100644 --- a/bundles/org.eclipse.rap.rwt.excanvas/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.rap.rwt.excanvas/META-INF/MANIFEST.MF @@ -6,5 +6,5 @@ Bundle-Version: 1.5.0.qualifier Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.4 Bundle-Vendor: %Bundle-Vendor -Require-Bundle: org.eclipse.rap.rwt;bundle-version="1.3.0", - org.eclipse.rap.ui;bundle-version="1.3.0" +Require-Bundle: org.eclipse.rap.rwt;bundle-version="2.0.0", + org.eclipse.rap.ui;bundle-version="2.0.0" diff --git a/bundles/org.eclipse.rap.rwt.excanvas/src/org/eclipse/rap/rwt/excanvas/ExCanvasResource.java b/bundles/org.eclipse.rap.rwt.excanvas/src/org/eclipse/rap/rwt/excanvas/ExCanvasResource.java index 29c0edf..13a09ad 100644 --- a/bundles/org.eclipse.rap.rwt.excanvas/src/org/eclipse/rap/rwt/excanvas/ExCanvasResource.java +++ b/bundles/org.eclipse.rap.rwt.excanvas/src/org/eclipse/rap/rwt/excanvas/ExCanvasResource.java @@ -16,8 +16,8 @@ *****************************************************************************/ package org.eclipse.rap.rwt.excanvas; -import org.eclipse.rwt.resources.IResource; -import org.eclipse.rwt.resources.IResourceManager.RegisterOptions; +import org.eclipse.rap.rwt.resources.IResource; +import org.eclipse.rap.rwt.resources.IResourceManager.RegisterOptions; public class ExCanvasResource implements IResource { diff --git a/bundles/org.eclipse.rap.rwt.visualization.google.demo/src/org/eclipse/rap/rwt/visualization/google/demo/Application.java b/bundles/org.eclipse.rap.rwt.visualization.google.demo/src/org/eclipse/rap/rwt/visualization/google/demo/Application.java index 7eb2109..73351df 100644 --- a/bundles/org.eclipse.rap.rwt.visualization.google.demo/src/org/eclipse/rap/rwt/visualization/google/demo/Application.java +++ b/bundles/org.eclipse.rap.rwt.visualization.google.demo/src/org/eclipse/rap/rwt/visualization/google/demo/Application.java @@ -21,6 +21,7 @@ package org.eclipse.rap.rwt.visualization.google.demo; import java.util.Date; +import org.eclipse.rap.rwt.lifecycle.IEntryPoint; import org.eclipse.rap.rwt.visualization.google.AnnotatedTimeLine; import org.eclipse.rap.rwt.visualization.google.AreaChart; import org.eclipse.rap.rwt.visualization.google.BarChart; @@ -30,13 +31,12 @@ import org.eclipse.rap.rwt.visualization.google.Geomap; import org.eclipse.rap.rwt.visualization.google.IntensityMap; import org.eclipse.rap.rwt.visualization.google.LineChart; import org.eclipse.rap.rwt.visualization.google.MotionChart; +import org.eclipse.rap.rwt.visualization.google.MotionChart.StateListener; import org.eclipse.rap.rwt.visualization.google.PieChart; import org.eclipse.rap.rwt.visualization.google.ScatterChart; import org.eclipse.rap.rwt.visualization.google.Table; import org.eclipse.rap.rwt.visualization.google.VisualizationWidget; -import org.eclipse.rap.rwt.visualization.google.MotionChart.StateListener; import org.eclipse.rap.rwt.visualization.google.json.JSONGoogleDataTable; -import org.eclipse.rwt.lifecycle.IEntryPoint; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/GoogleAPIResource.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/GoogleAPIResource.java index e329424..c989f9b 100644 --- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/GoogleAPIResource.java +++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/GoogleAPIResource.java @@ -10,8 +10,8 @@ ******************************************************************************/ package org.eclipse.rap.rwt.visualization.google.internal; -import org.eclipse.rwt.resources.IResource; -import org.eclipse.rwt.resources.IResourceManager.RegisterOptions; +import org.eclipse.rap.rwt.resources.IResource; +import org.eclipse.rap.rwt.resources.IResourceManager.RegisterOptions; public class GoogleAPIResource implements IResource { diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/GoogleVisualizationResource.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/GoogleVisualizationResource.java index 26981bd..5507cde 100644 --- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/GoogleVisualizationResource.java +++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/GoogleVisualizationResource.java @@ -10,8 +10,8 @@ ******************************************************************************/ package org.eclipse.rap.rwt.visualization.google.internal; -import org.eclipse.rwt.resources.IResource; -import org.eclipse.rwt.resources.IResourceManager.RegisterOptions; +import org.eclipse.rap.rwt.resources.IResource; +import org.eclipse.rap.rwt.resources.IResourceManager.RegisterOptions; /** * <p>Base type for visualization resources.</p> diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/VisualizationWidgetLCA.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/VisualizationWidgetLCA.java index b0052d3..69f74c5 100644 --- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/VisualizationWidgetLCA.java +++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/VisualizationWidgetLCA.java @@ -15,14 +15,14 @@ package org.eclipse.rap.rwt.visualization.google.internal; import java.io.IOException; import org.eclipse.rap.rwt.visualization.google.VisualizationWidget; -import org.eclipse.rwt.internal.protocol.ClientObjectFactory; -import org.eclipse.rwt.internal.protocol.IClientObject; -import org.eclipse.rwt.lifecycle.AbstractWidgetLCA; -import org.eclipse.rwt.lifecycle.ControlLCAUtil; -import org.eclipse.rwt.lifecycle.IWidgetAdapter; -import org.eclipse.rwt.lifecycle.JSWriter; -import org.eclipse.rwt.lifecycle.WidgetLCAUtil; -import org.eclipse.rwt.lifecycle.WidgetUtil; +import org.eclipse.rap.rwt.internal.protocol.ClientObjectFactory; +import org.eclipse.rap.rwt.internal.protocol.IClientObject; +import org.eclipse.rap.rwt.lifecycle.AbstractWidgetLCA; +import org.eclipse.rap.rwt.lifecycle.ControlLCAUtil; +import org.eclipse.rap.rwt.lifecycle.IWidgetAdapter; +import org.eclipse.rap.rwt.lifecycle.JSWriter; +import org.eclipse.rap.rwt.lifecycle.WidgetLCAUtil; +import org.eclipse.rap.rwt.lifecycle.WidgetUtil; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Widget; diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/linechartkit/LineChartLCA.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/linechartkit/LineChartLCA.java index 3bbe21f..e75d67a 100644 --- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/linechartkit/LineChartLCA.java +++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/linechartkit/LineChartLCA.java @@ -14,10 +14,10 @@ package org.eclipse.rap.rwt.visualization.google.internal.linechartkit; import java.io.IOException; +import org.eclipse.rap.rwt.lifecycle.ControlLCAUtil; +import org.eclipse.rap.rwt.lifecycle.JSWriter; import org.eclipse.rap.rwt.visualization.google.LineChart; import org.eclipse.rap.rwt.visualization.google.internal.VisualizationWidgetLCA; -import org.eclipse.rwt.lifecycle.ControlLCAUtil; -import org.eclipse.rwt.lifecycle.JSWriter; import org.eclipse.swt.widgets.Widget; public class LineChartLCA extends VisualizationWidgetLCA { diff --git a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/motionchartkit/MotionChartLCA.java b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/motionchartkit/MotionChartLCA.java index 3707775..be663c2 100644 --- a/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/motionchartkit/MotionChartLCA.java +++ b/bundles/org.eclipse.rap.rwt.visualization.google/src/org/eclipse/rap/rwt/visualization/google/internal/motionchartkit/MotionChartLCA.java @@ -12,9 +12,9 @@ ******************************************************************************/ package org.eclipse.rap.rwt.visualization.google.internal.motionchartkit; +import org.eclipse.rap.rwt.lifecycle.WidgetLCAUtil; import org.eclipse.rap.rwt.visualization.google.MotionChart; import org.eclipse.rap.rwt.visualization.google.internal.VisualizationWidgetLCA; -import org.eclipse.rwt.lifecycle.WidgetLCAUtil; import org.eclipse.swt.widgets.Widget; public class MotionChartLCA extends VisualizationWidgetLCA { diff --git a/bundles/org.eclipse.rap.rwt.visualization.jit.demo/src/org/eclipse/rap/rwt/visualization/jit/demo/Application.java b/bundles/org.eclipse.rap.rwt.visualization.jit.demo/src/org/eclipse/rap/rwt/visualization/jit/demo/Application.java index f6079fd..79a649f 100644 --- a/bundles/org.eclipse.rap.rwt.visualization.jit.demo/src/org/eclipse/rap/rwt/visualization/jit/demo/Application.java +++ b/bundles/org.eclipse.rap.rwt.visualization.jit.demo/src/org/eclipse/rap/rwt/visualization/jit/demo/Application.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright � 2010-2011 Texas Center for Applied Technology + * Copyright (C) 2010-2011 Texas Center for Applied Technology * Texas Engineering Experiment Station * The Texas A&M University System * All Rights Reserved. @@ -22,12 +22,12 @@ import java.io.InputStreamReader; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.Path; +import org.eclipse.rap.rwt.lifecycle.IEntryPoint; import org.eclipse.rap.rwt.visualization.jit.HyperTree; import org.eclipse.rap.rwt.visualization.jit.JITVisualizationWidget; import org.eclipse.rap.rwt.visualization.jit.RGraph; import org.eclipse.rap.rwt.visualization.jit.SpaceTree; import org.eclipse.rap.rwt.visualization.jit.TreeMap; -import org.eclipse.rwt.lifecycle.IEntryPoint; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.SashForm; import org.eclipse.swt.events.SelectionAdapter; diff --git a/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/JITAPIResource.java b/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/JITAPIResource.java index 1b3c5b2..1662831 100644 --- a/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/JITAPIResource.java +++ b/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/JITAPIResource.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright © 2010-2011 Austin Riddle + * Copyright � 2010-2011 Austin Riddle * All Rights Reserved. * * This program and the accompanying materials @@ -13,8 +13,8 @@ *****************************************************************************/ package org.eclipse.rap.rwt.visualization.jit.internal; -import org.eclipse.rwt.resources.IResource; -import org.eclipse.rwt.resources.IResourceManager.RegisterOptions; +import org.eclipse.rap.rwt.resources.IResource; +import org.eclipse.rap.rwt.resources.IResourceManager.RegisterOptions; public class JITAPIResource implements IResource { diff --git a/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/JITVisualizationResource.java b/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/JITVisualizationResource.java index d0d6233..948e857 100644 --- a/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/JITVisualizationResource.java +++ b/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/JITVisualizationResource.java @@ -10,8 +10,8 @@ ******************************************************************************/ package org.eclipse.rap.rwt.visualization.jit.internal; -import org.eclipse.rwt.resources.IResource; -import org.eclipse.rwt.resources.IResourceManager.RegisterOptions; +import org.eclipse.rap.rwt.resources.IResource; +import org.eclipse.rap.rwt.resources.IResourceManager.RegisterOptions; public abstract class JITVisualizationResource implements IResource { diff --git a/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/JITWidgetLCA.java b/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/JITWidgetLCA.java index a4e407e..23b73a4 100644 --- a/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/JITWidgetLCA.java +++ b/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/JITWidgetLCA.java @@ -1,5 +1,5 @@ /****************************************************************************** - * Copyright © 2010-2011 Austin Riddle + * Copyright � 2010-2011 Austin Riddle * All Rights Reserved. * * This program and the accompanying materials @@ -18,14 +18,14 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Vector; +import org.eclipse.rap.rwt.lifecycle.AbstractWidgetLCA; +import org.eclipse.rap.rwt.lifecycle.ControlLCAUtil; +import org.eclipse.rap.rwt.lifecycle.IWidgetAdapter; +import org.eclipse.rap.rwt.lifecycle.JSVar; +import org.eclipse.rap.rwt.lifecycle.JSWriter; +import org.eclipse.rap.rwt.lifecycle.WidgetLCAUtil; +import org.eclipse.rap.rwt.lifecycle.WidgetUtil; import org.eclipse.rap.rwt.visualization.jit.JITVisualizationWidget; -import org.eclipse.rwt.lifecycle.AbstractWidgetLCA; -import org.eclipse.rwt.lifecycle.ControlLCAUtil; -import org.eclipse.rwt.lifecycle.IWidgetAdapter; -import org.eclipse.rwt.lifecycle.JSVar; -import org.eclipse.rwt.lifecycle.JSWriter; -import org.eclipse.rwt.lifecycle.WidgetLCAUtil; -import org.eclipse.rwt.lifecycle.WidgetUtil; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Widget; diff --git a/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/spacetreekit/SpaceTreeLCA.java b/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/spacetreekit/SpaceTreeLCA.java index ef4cc06..4bbe94e 100644 --- a/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/spacetreekit/SpaceTreeLCA.java +++ b/bundles/org.eclipse.rap.rwt.visualization.jit/src/org/eclipse/rap/rwt/visualization/jit/internal/spacetreekit/SpaceTreeLCA.java @@ -12,13 +12,8 @@ ******************************************************************************/ package org.eclipse.rap.rwt.visualization.jit.internal.spacetreekit; -import java.io.IOException; - -import org.eclipse.rap.rwt.visualization.jit.JITGraphWidget; import org.eclipse.rap.rwt.visualization.jit.SpaceTree; import org.eclipse.rap.rwt.visualization.jit.internal.JITGraphLCA; -import org.eclipse.rwt.lifecycle.JSWriter; -import org.eclipse.swt.widgets.Widget; public class SpaceTreeLCA extends JITGraphLCA { |