From 52ae262a804b8c49ed8ee4b7bc4fac2fd21cc18c Mon Sep 17 00:00:00 2001
From: Dani Megert
Date: Mon, 7 Nov 2016 15:27:25 +0100
Subject: Clean up after bug 506427

---
 org.eclipse.jface.text.tests/META-INF/MANIFEST.MF  |  3 +-
 .../text/source/LineNumberRulerColumnTest.java     | 47 --------------------
 .../jface/text/tests/JFaceTextTestSuite.java       |  2 +-
 .../tests/source/LineNumberRulerColumnTest.java    | 51 ++++++++++++++++++++++
 4 files changed, 54 insertions(+), 49 deletions(-)
 delete mode 100644 org.eclipse.jface.text.tests/src/org/eclipse/jface/text/source/LineNumberRulerColumnTest.java
 create mode 100644 org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/LineNumberRulerColumnTest.java

(limited to 'org.eclipse.jface.text.tests')

diff --git a/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF b/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF
index 9cc06255083..e716de1e27d 100644
--- a/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.jface.text.tests/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@ Bundle-Localization: plugin
 Export-Package: 
  org.eclipse.jface.text.tests,
  org.eclipse.jface.text.tests.reconciler,
- org.eclipse.jface.text.tests.rules
+ org.eclipse.jface.text.tests.rules,
+ org.eclipse.jface.text.tests.source
 Require-Bundle: 
  org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.5.0,4.0.0)",
diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/source/LineNumberRulerColumnTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/source/LineNumberRulerColumnTest.java
deleted file mode 100644
index c3faa2fc3f7..00000000000
--- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/source/LineNumberRulerColumnTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2016 Rüdiger Herrmann and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     Rüdiger Herrmann - Insufficient is-disposed check in LineNumberRulerColumn::redraw - https://bugs.eclipse.org/bugs/show_bug.cgi?id=506427
- *******************************************************************************/
-package org.eclipse.jface.text.source;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Shell;
-
-public class LineNumberRulerColumnTest {
-
-	private Shell fParent;
-
-	@Before
-	public void setUp() {
-		fParent= new Shell();
-	}
-
-	@After
-	public void tearDown() {
-		fParent.dispose();
-	}
-
-	@Test
-	public void testRedrawAfterDispose() {
-		LineNumberRulerColumn lineNumberRulerColumn= new LineNumberRulerColumn();
-		CompositeRuler ruler= new CompositeRuler();
-		ruler.addDecorator(0, lineNumberRulerColumn);
-		SourceViewer sourceViewer= new SourceViewer(fParent, ruler, SWT.NONE);
-		lineNumberRulerColumn.getControl().setSize(10, 10);
-
-		sourceViewer.getTextWidget().dispose();
-
-		lineNumberRulerColumn.redraw();
-	}
-
-}
diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/JFaceTextTestSuite.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/JFaceTextTestSuite.java
index 35febd98fad..3ff216a9da3 100644
--- a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/JFaceTextTestSuite.java
+++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/JFaceTextTestSuite.java
@@ -14,13 +14,13 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
-import org.eclipse.jface.text.source.LineNumberRulerColumnTest;
 import org.eclipse.jface.text.tests.reconciler.AbstractReconcilerTest;
 import org.eclipse.jface.text.tests.rules.DefaultPartitionerTest;
 import org.eclipse.jface.text.tests.rules.DefaultPartitionerZeroLengthTest;
 import org.eclipse.jface.text.tests.rules.FastPartitionerTest;
 import org.eclipse.jface.text.tests.rules.ScannerColumnTest;
 import org.eclipse.jface.text.tests.rules.WordRuleTest;
+import org.eclipse.jface.text.tests.source.LineNumberRulerColumnTest;
 
 
 /**
diff --git a/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/LineNumberRulerColumnTest.java b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/LineNumberRulerColumnTest.java
new file mode 100644
index 00000000000..8d1491b78c4
--- /dev/null
+++ b/org.eclipse.jface.text.tests/src/org/eclipse/jface/text/tests/source/LineNumberRulerColumnTest.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2016 Rüdiger Herrmann and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Rüdiger Herrmann - Insufficient is-disposed check in LineNumberRulerColumn::redraw - https://bugs.eclipse.org/bugs/show_bug.cgi?id=506427
+ *******************************************************************************/
+package org.eclipse.jface.text.tests.source;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Shell;
+
+import org.eclipse.jface.text.source.CompositeRuler;
+import org.eclipse.jface.text.source.LineNumberRulerColumn;
+import org.eclipse.jface.text.source.SourceViewer;
+
+public class LineNumberRulerColumnTest {
+
+	private Shell fParent;
+
+	@Before
+	public void setUp() {
+		fParent= new Shell();
+	}
+
+	@After
+	public void tearDown() {
+		fParent.dispose();
+	}
+
+	@Test
+	public void testRedrawAfterDispose() {
+		LineNumberRulerColumn lineNumberRulerColumn= new LineNumberRulerColumn();
+		CompositeRuler ruler= new CompositeRuler();
+		ruler.addDecorator(0, lineNumberRulerColumn);
+		SourceViewer sourceViewer= new SourceViewer(fParent, ruler, SWT.NONE);
+		lineNumberRulerColumn.getControl().setSize(10, 10);
+
+		sourceViewer.getTextWidget().dispose();
+
+		lineNumberRulerColumn.redraw();
+	}
+
+}
-- 
cgit v1.2.3