web UI changed to use RAP 3.1
authorVictor Kirhenshtein <victor@netxms.org>
Sat, 23 Jul 2016 09:01:31 +0000 (12:01 +0300)
committerVictor Kirhenshtein <victor@netxms.org>
Sat, 23 Jul 2016 09:01:31 +0000 (12:01 +0300)
src/java/netxms-eclipse/swtchart/src/org/swtchart/internal/axis/AxisTickLabels.java
webui/webapp/AgentManager/META-INF/MANIFEST.MF
webui/webapp/Dashboard/META-INF/MANIFEST.MF
webui/webapp/FileManager/META-INF/MANIFEST.MF
webui/webapp/ImageLibrary/META-INF/MANIFEST.MF
webui/webapp/ObjectTools/META-INF/MANIFEST.MF
webui/webapp/ServerConfig/META-INF/MANIFEST.MF
webui/webapp/UserManager/META-INF/MANIFEST.MF
webui/webapp/swtchart/src/org/swtchart/internal/axis/AxisTickLabels.java

index c2b9897..8271c3f 100644 (file)
@@ -982,7 +982,6 @@ public class AxisTickLabels implements PaintListener
         */
        private void drawRotatedText(GC gc, String text, float x, float y, int angle)
        {
-
                int textWidth = gc.textExtent(text).x;
                int textHeight = gc.textExtent(text).y;
 
index 64460b6..04bf03d 100644 (file)
@@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.rap.ui;bundle-version="2.3.1",
  org.netxms.webui.core;bundle-version="2.0.0",
  org.netxms.ui.eclipse.objectbrowser;bundle-version="2.0.0",
  org.netxms.ui.eclipse.nxsl;bundle-version="2.0.0",
- org.eclipse.rap.addons.filedialog;bundle-version="0.6.0"
+ org.eclipse.rap.filedialog;bundle-version="3.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.netxms.ui.eclipse.agentmanager.dialogs,
index 2d69e4e..376a38e 100644 (file)
@@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.rap.ui;bundle-version="2.3.2",
  org.netxms.ui.eclipse.filemanager;bundle-version="2.0.6",
  org.netxms.ui.eclipse.perfview;bundle-version="2.0.7",
  org.netxms.ui.eclipse.objectview;bundle-version="2.0.7",
- org.eclipse.rap.addons.filedialog;bundle-version="0.6.0"
+ org.eclipse.rap.filedialog;bundle-version="3.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.netxms.ui.eclipse.dashboard.api,
index 26d8e9e..c779a85 100644 (file)
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.8.0",
  org.eclipse.rap.ui;bundle-version="2.3.1",
  org.netxms.ui.eclipse.clientlibrary;bundle-version="2.0.9",
  org.netxms.webui.core;bundle-version="2.0.10",
- org.eclipse.rap.addons.filedialog;bundle-version="0.6.0"
+ org.eclipse.rap.filedialog;bundle-version="3.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.netxms.ui.eclipse.filemanager.views,
index d91f2a7..873b5fc 100644 (file)
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.rap.ui;bundle-version="2.3.1",
  org.netxms.nebula.widgets.gallery;bundle-version="0.5.3",
  org.netxms.ui.eclipse.clientlibrary;bundle-version="2.0.0",
  org.netxms.webui.core;bundle-version="2.0.0",
- org.eclipse.rap.addons.filedialog;bundle-version="0.6.0"
+ org.eclipse.rap.filedialog;bundle-version="3.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.netxms.ui.eclipse.imagelibrary,
index b9f00e7..26de392 100644 (file)
@@ -12,9 +12,9 @@ Require-Bundle: org.eclipse.rap.ui;bundle-version="2.3.1",
  org.netxms.webui.core;bundle-version="2.0.10",
  org.netxms.ui.eclipse.usermanager;bundle-version="2.0.8",
  org.netxms.ui.eclipse.snmp;bundle-version="2.0.0",
- org.eclipse.rap.addons.filedialog;bundle-version="0.6.0",
  org.netxms.ui.eclipse.objectbrowser;bundle-version="2.0.7",
- org.netxms.ui.eclipse.filemanager;bundle-version="2.0.6"
+ org.netxms.ui.eclipse.filemanager;bundle-version="2.0.6",
+ org.eclipse.rap.filedialog;bundle-version="3.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.netxms.ui.eclipse.objecttools.api
index dd551a6..e3f4263 100644 (file)
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.10.0",
  org.netxms.ui.eclipse.epp;bundle-version="2.0.4",
  org.netxms.ui.eclipse.objecttools;bundle-version="2.0.7",
  org.netxms.ui.eclipse.datacollection;bundle-version="2.0.5",
- org.eclipse.rap.addons.filedialog;bundle-version="0.6.0"
+ org.eclipse.rap.filedialog;bundle-version="3.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.netxms.ui.eclipse.serverconfig.widgets,
index 27f2fb5..808ad91 100644 (file)
@@ -6,9 +6,9 @@ Bundle-Version: 2.0.8
 Bundle-Activator: org.netxms.ui.eclipse.usermanager.Activator
 Bundle-Vendor: netxms.org
 Require-Bundle: org.eclipse.rap.ui;bundle-version="2.3.2",
- org.netxms.ui.eclipse.clientlibrary;bundle-version="2.0.9",
- org.netxms.webui.core;bundle-version="2.0.10",
- org.eclipse.rap.addons.filedialog;bundle-version="0.6.0"
+ org.netxms.ui.eclipse.clientlibrary;bundle-version="2.1.0",
+ org.netxms.webui.core;bundle-version="2.1.0",
+ org.eclipse.rap.filedialog;bundle-version="3.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: org.netxms.ui.eclipse.usermanager.dialogs
index a7810cc..fc9a398 100644 (file)
@@ -22,6 +22,7 @@ import org.eclipse.swt.graphics.Font;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
+import org.eclipse.swt.graphics.Transform;
 import org.eclipse.swt.widgets.Display;
 import org.swtchart.Chart;
 import org.swtchart.IAxis.Position;
@@ -980,6 +981,16 @@ public class AxisTickLabels implements PaintListener
         */
        private void drawRotatedText(GC gc, String text, float x, float y, int angle)
        {
+      // set transform to rotate
+      Transform transform = new Transform(gc.getDevice());
+      transform.translate(x, y);
+      transform.rotate(360 - angle);
+      gc.setTransform(transform);
+
+      gc.drawText(text, 0, 0);
+
+      transform.dispose();
+      gc.setTransform(null);
        }
 
        /**