From 925631dc3d548c2432f5f9d020bcafb0acf9beec Mon Sep 17 00:00:00 2001
From: "p.ciardelli"
Date: Tue, 29 Jan 2008 12:41:33 +0000
Subject: [PATCH]
---
.../META-INF/MANIFEST.MF | 3 +-
.../plugin.xml | 1 +
.../taxeditor/designproposal1/Activator.java | 3 +-
.../designproposal1/view/MyRuleScanner.java | 12 ++++++--
.../view/MySourceViewerConfig.java | 13 +++++++--
.../view/PilosellaEditorView.java | 29 ++++++++++++++++---
6 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/META-INF/MANIFEST.MF b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/META-INF/MANIFEST.MF
index 035b8684b..beb85f672 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/META-INF/MANIFEST.MF
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Bundle-Activator: eu.etaxonomy.taxeditor.designproposal1.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.ui.forms,
- org.eclipse.jface.text
+ org.eclipse.jface.text,
+ org.eclipse.ui.editors
Eclipse-LazyStart: true
Export-Package: com.swtdesigner,
eu.etaxonomy.taxeditor.designproposal1,
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/plugin.xml b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/plugin.xml
index 181e95f13..5f23eeb08 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/plugin.xml
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/plugin.xml
@@ -71,6 +71,7 @@
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/Activator.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/Activator.java
index 95ae9994f..3e52b5d05 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/Activator.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/Activator.java
@@ -18,7 +18,7 @@ public class Activator extends AbstractUIPlugin {
// The shared instance
private static Activator plugin;
-
+
// private CdmApplicationController cdmApp = new CdmApplicationController();
/**
@@ -27,6 +27,7 @@ public class Activator extends AbstractUIPlugin {
public Activator() {
}
+
/*
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MyRuleScanner.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MyRuleScanner.java
index 712984426..c68ce97f8 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MyRuleScanner.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MyRuleScanner.java
@@ -7,25 +7,31 @@ import org.eclipse.jface.text.rules.IToken;
import org.eclipse.jface.text.rules.RuleBasedScanner;
import org.eclipse.jface.text.rules.SingleLineRule;
import org.eclipse.jface.text.rules.Token;
+import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.widgets.Display;
+import com.swtdesigner.SWTResourceManager;
+
public class MyRuleScanner extends RuleBasedScanner {
private static Color TAG_COLOR= new Color(Display.getCurrent(), new RGB(200, 0, 0));
private static Color COMMENT_COLOR= new Color(Display.getCurrent(), new RGB(0, 200, 0));
public MyRuleScanner() {
IToken tagToken =
- new Token(
- new TextAttribute(TAG_COLOR));
+ new Token(new TextAttribute(TAG_COLOR));
+// new TextAttribute(TAG_COLOR,
+// null,
+// SWT.BOLD,
+// SWTResourceManager.getFont("Georgia", 11, SWT.NONE)));
IToken commentToken= new Token(new TextAttribute(COMMENT_COLOR));
IRule[] rules = new IRule[2];
//Add rule for processing instructions
rules[0] = new SingleLineRule("", tagToken);
- rules[1] = (new EndOfLineRule("//", commentToken)); //$NON-NLS-1$
+ rules[1] = new EndOfLineRule("//", commentToken); //$NON-NLS-1$
setRules(rules);
}
}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MySourceViewerConfig.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MySourceViewerConfig.java
index 41d112e3c..a66fade85 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MySourceViewerConfig.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/MySourceViewerConfig.java
@@ -10,24 +10,31 @@ import org.eclipse.jface.text.rules.DefaultDamagerRepairer;
import org.eclipse.jface.text.rules.Token;
import org.eclipse.jface.text.source.ISourceViewer;
import org.eclipse.jface.text.source.SourceViewerConfiguration;
+import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.widgets.Display;
+import com.swtdesigner.SWTResourceManager;
+
public class MySourceViewerConfig extends SourceViewerConfiguration {
private MyRuleScanner scanner;
private static Color DEFAULT_TAG_COLOR =
- new Color(Display.getCurrent(), new RGB(0, 0, 200));
+ new Color(Display.getCurrent(), new RGB(0, 0, 0));
public MySourceViewerConfig() {
-
}
protected MyRuleScanner getTagScanner() {
if (scanner == null) {
scanner = new MyRuleScanner();
scanner.setDefaultReturnToken(
- new Token(new TextAttribute(DEFAULT_TAG_COLOR)));
+ new Token(
+ new TextAttribute(DEFAULT_TAG_COLOR,
+ null,
+ 0,
+ SWTResourceManager.getFont("Georgia", 11, SWT.BOLD | SWT.ITALIC))
+ ));
}
return scanner;
}
diff --git a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/PilosellaEditorView.java b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/PilosellaEditorView.java
index 31a71072e..bf66c06f2 100644
--- a/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/PilosellaEditorView.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor.designproposal1/src/eu/etaxonomy/taxeditor/designproposal1/view/PilosellaEditorView.java
@@ -20,6 +20,7 @@ import org.eclipse.swt.events.KeyEvent;
import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.MouseAdapter;
import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.events.MouseListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
@@ -48,6 +49,7 @@ import org.eclipse.swt.widgets.ToolItem;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.editors.text.TextEditor;
import org.eclipse.ui.part.EditorPart;
import com.swtdesigner.ResourceManager;
import com.swtdesigner.SWTResourceManager;
@@ -62,8 +64,8 @@ import eu.etaxonomy.taxeditor.designproposal1.controller.OpenNameEditorAction;
import eu.etaxonomy.taxeditor.designproposal1.controller.SaveNameAction;
import eu.etaxonomy.taxeditor.designproposal1.model.TaxonName;
-//public class PilosellaEditorView extends EditorPart implements ICdmEventListener {
public class PilosellaEditorView extends EditorPart {
+//public class PilosellaEditorView extends TextEditor {
private Text hieraciumFuscoatrumSubspText_1;
private Text hieraciumRubroonegenseNorrlText;
@@ -148,7 +150,7 @@ public class PilosellaEditorView extends EditorPart {
// }
// });
parent.setLayout(new GridLayout());
- Document doc = new Document("");
+ Document doc = new Document();
final Label taxonomicallyIncludedInLabel = new Label(parent, SWT.NONE);
taxonomicallyIncludedInLabel.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
@@ -361,7 +363,7 @@ public class PilosellaEditorView extends EditorPart {
final GridData gd_text_1 = new GridData(SWT.FILL, SWT.CENTER, true, false);
gd_text_1.widthHint = 300;
text_1.setLayoutData(gd_text_1);
- text_1.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.NONE));
+ text_1.setFont(SWTResourceManager.getFont("Georgia", 11, SWT.BOLD | SWT.ITALIC));
text_1.setText("Hieracium fuscoatrum Nägeli & Peter, Hierac. Mitt.-Eur. 1: 315. 1885");
text_1.addFocusListener(new FocusListener() {
@@ -405,6 +407,8 @@ public class PilosellaEditorView extends EditorPart {
label_2.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE));
label_2.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/heterosyn_no_bg.gif"));
+// addDropDown(label_2, menuAddRel);
+
hieraciumFuscoatrumSubspText = new Text(composite, SWT.WRAP);
final GridData gd_hieraciumFuscoatrumSubspText = new GridData(SWT.FILL, SWT.CENTER, true, false);
gd_hieraciumFuscoatrumSubspText.widthHint = 300;
@@ -477,6 +481,23 @@ public class PilosellaEditorView extends EditorPart {
final Menu menu1 = new Menu(labelWithMenu);
labelWithMenu.setMenu(menu1);
+ labelWithMenu.addMouseListener(new MouseListener() {
+
+ public void mouseDoubleClick(MouseEvent e) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void mouseDown(MouseEvent e) {
+ menu1.setVisible(true);
+ }
+
+ public void mouseUp(MouseEvent e) {
+ // TODO Auto-generated method stub
+
+ }
+
+ });
final MenuItem deletehieraciumFuscoatrumMenuItem = new MenuItem(menu1, SWT.NONE);
deletehieraciumFuscoatrumMenuItem.setImage(ResourceManager.getPluginImage(Activator.getDefault(), "icons/delete.gif"));
@@ -539,7 +560,7 @@ public class PilosellaEditorView extends EditorPart {
styledText.setLayoutData(gd_styledText);
sourceviewer.setDocument(doc);
sourceviewer.configure(new MySourceViewerConfig());
- sourceviewer.setTabsToSpacesConverter(null);
+// sourceviewer.setTabsToSpacesConverter(null);
// final Menu menu = new Menu(toolBar);
--
2.34.1