aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorszarnekow2009-03-26 12:29:41 (EDT)
committersefftinge2009-03-26 12:29:41 (EDT)
commit9973691b9fd3e9f73c78599f198470eb888e1cb0 (patch)
treeb1e2735ec2bfa1a36575216798ff742879dd6c5e
parent9629fd3c0046fa246b5d36326d2a094d12a22a18 (diff)
downloadorg.eclipse.xtext-9973691b9fd3e9f73c78599f198470eb888e1cb0.zip
org.eclipse.xtext-9973691b9fd3e9f73c78599f198470eb888e1cb0.tar.gz
org.eclipse.xtext-9973691b9fd3e9f73c78599f198470eb888e1cb0.tar.bz2
Moved class, fixed naming issues
-rw-r--r--plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/AbstractDamagerRepairer.java (renamed from plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/DefaultDamagerRepairerAdapter.java)11
-rw-r--r--plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/FastLineBasedDamagerRepairer.java24
-rw-r--r--plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/XtextDamagerRepairer.java3
3 files changed, 29 insertions, 9 deletions
diff --git a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/DefaultDamagerRepairerAdapter.java b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/AbstractDamagerRepairer.java
index afd5761..5f2767d 100644
--- a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/DefaultDamagerRepairerAdapter.java
+++ b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/AbstractDamagerRepairer.java
@@ -5,23 +5,20 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.eclipse.xtext.ui.core;
+package org.eclipse.xtext.ui.core.editor;
import org.eclipse.jface.text.presentation.IPresentationDamager;
import org.eclipse.jface.text.presentation.IPresentationRepairer;
import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
import org.eclipse.jface.text.rules.ITokenScanner;
-import org.eclipse.xtext.ui.core.editor.IDamagerRepairer;
-
-import com.google.inject.Inject;
/**
+ * Base class for damager / repairer implementations. Inherits everything from a default implementation.
* @author Sebastian Zarnekow - Initial contribution and API
*/
-public class DefaultDamagerRepairerAdapter extends DefaultDamagerRepairer implements IDamagerRepairer {
+public abstract class AbstractDamagerRepairer extends DefaultDamagerRepairer implements IDamagerRepairer {
- @Inject
- public DefaultDamagerRepairerAdapter(ITokenScanner scanner) {
+ protected AbstractDamagerRepairer(ITokenScanner scanner) {
super(scanner);
}
diff --git a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/FastLineBasedDamagerRepairer.java b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/FastLineBasedDamagerRepairer.java
new file mode 100644
index 0000000..e5df43f5
--- /dev/null
+++ b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/FastLineBasedDamagerRepairer.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2009 itemis AG (http://www.itemis.eu) 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
+ *******************************************************************************/
+package org.eclipse.xtext.ui.core.editor;
+
+import org.eclipse.jface.text.rules.ITokenScanner;
+
+import com.google.inject.Inject;
+
+/**
+ * @author Sebastian Zarnekow - Initial contribution and API
+ */
+public class FastLineBasedDamagerRepairer extends AbstractDamagerRepairer{
+
+ @Inject
+ public FastLineBasedDamagerRepairer(ITokenScanner scanner) {
+ super(scanner);
+ }
+
+}
diff --git a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/XtextDamagerRepairer.java b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/XtextDamagerRepairer.java
index 3270c0e..3a6c0f2 100644
--- a/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/XtextDamagerRepairer.java
+++ b/plugins/org.eclipse.xtext.ui.core/src/org/eclipse/xtext/ui/core/editor/XtextDamagerRepairer.java
@@ -18,7 +18,6 @@ import org.eclipse.xtext.parsetree.CompositeNode;
import org.eclipse.xtext.parsetree.LeafNode;
import org.eclipse.xtext.parsetree.Range;
import org.eclipse.xtext.resource.XtextResource;
-import org.eclipse.xtext.ui.core.DefaultDamagerRepairerAdapter;
import org.eclipse.xtext.ui.core.editor.model.UnitOfWork;
import org.eclipse.xtext.ui.core.editor.model.XtextDocument;
@@ -27,7 +26,7 @@ import com.google.inject.Inject;
/**
* @author Sebastian Zarnekow - Initial contribution and API
*/
-public class XtextDamagerRepairer extends DefaultDamagerRepairerAdapter {
+public class XtextDamagerRepairer extends AbstractDamagerRepairer {
@Inject
public XtextDamagerRepairer(ITokenScanner scanner) {