taxeditor-navigation/META-INF/MANIFEST.MF -text
taxeditor-navigation/build.properties -text
taxeditor-navigation/icons/edit_16x16.gif -text
+taxeditor-navigation/icons/tree_icon.jpg -text
+taxeditor-navigation/icons/tree_icon_small.jpg -text
taxeditor-navigation/plugin.xml -text
taxeditor-navigation/pom.xml -text
taxeditor-navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java -text
name="Save All">\r
</command>\r
</extension>\r
- <!--extension\r
- point="org.eclipse.ui.perspectiveExtensions">\r
- <perspectiveExtension\r
- targetID="eu.etaxonomy.taxeditor.application.perspective">\r
- <view\r
- closeable="true"\r
- id="eu.etaxonomy.taxeditor.navigation.taxonomictree.treeView"\r
- minimized="false"\r
- moveable="false"\r
- ratio="0.4"\r
- relationship="left"\r
- relative="org.eclipse.ui.editorss"\r
- visible="true">\r
- </view>\r
- </perspectiveExtension>\r
- </extension-->\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+\r
+<extension\r
+point="org.eclipse.ui.activities">\r
+<activity\r
+description="Disable unwanted eclipse UI"\r
+id="com.test.ui.disable"\r
+name="Disable">\r
+</activity>\r
+<activityPatternBinding\r
+activityId="com.test.ui.disable"\r
+pattern="org\.eclipse\.ui\.ide/org\.eclipse\.ui\.wizards\.new\.project">\r
+</activityPatternBinding>\r
+<activityPatternBinding\r
+activityId="com.test.ui.disable"\r
+pattern="org\.eclipse\.ui\.ide/org\.eclipse\.ui\.wizards\.new\.file">\r
+</activityPatternBinding>\r
+<activityPatternBinding\r
+activityId="com.test.ui.disable"\r
+pattern="org\.eclipse\.ui\.ide/org\.eclipse\.ui\.wizards\.new\.folder">\r
+</activityPatternBinding>\r
+<!--activityPatternBinding\r
+activityId="com.test.ui.disable"\r
+pattern="org\.eclipse\.ui\.editors/org\.eclipse\.ui\.editors\.wizards\.UntitledTextFileWizard">\r
+</activityPatternBinding-->\r
+</extension>\r
+\r
</plugin>\r
import org.eclipse.swt.layout.GridLayout;\r
import org.eclipse.swt.widgets.Composite;\r
import org.eclipse.swt.widgets.Control;\r
-import org.eclipse.swt.widgets.Tree;\r
import org.eclipse.ui.IEditorInput;\r
import org.eclipse.ui.IEditorSite;\r
import org.eclipse.ui.PartInitException;\r
import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotationModel;\r
import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInput;\r
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;\r
-import eu.etaxonomy.taxeditor.propertysheet.EditorPropertySheetEntry;\r
-import eu.etaxonomy.taxeditor.propertysheet.PropertySheetUtil;\r
\r
/**\r
* @author p.ciardelli\r
\r
// error identifiers, images and colors\r
public static String ERROR_TYPE = "error.type";\r
- public static Image ERROR_IMAGE = ImageResources.getImage(ImageResources.ACTIVE_DELETE_ICON);\r
+ public static Image ERROR_IMAGE = ImageResources.getImage(ImageResources.ERROR_ANNOTATION_ICON);\r
public static final RGB ERROR_RGB = new RGB(255, 0, 0); \r
\r
public ErrorAnnotation(IMarker marker) {\r
}\r
\r
public String getText() {\r
- return "Error in the string " + text;\r
+ return "Error: " + text;\r
}\r
\r
public int getLayer() {\r
if (h <= 0)\r
return;\r
\r
- Image image = ImageResources.getImage(ImageResources.ERROR_ANNOTATION_ICON);\r
+// Image image = ImageResources.getImage(ImageResources.ERROR_ANNOTATION_ICON);\r
+ Image image = ERROR_IMAGE;\r
\r
Rectangle r = image.getBounds();\r
\r
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.store.StoreUtil;
/**
* @author n.hoffmann
* @see org.eclipse.ui.IEditorInput#getPersistable()
*/
public IPersistableElement getPersistable() {
- return this;
+ TaxonNode test = CdmStore.getTaxonService().getTaxonNodeByUuid(taxonNode.getUuid());
+ boolean isPersistable = CdmStore.getTaxonService().getTaxonNodeByUuid(taxonNode.getUuid()) != null;
+ if (isPersistable) {
+ return this;
+ } else {
+ return null;
+ }
}
/* (non-Javadoc)
public IAdaptable createElement(IMemento memento) {\r
// Get the uuid\r
String taxonNodeUuid = memento.getString(TAXON_NODE_UUID);\r
- if (taxonNodeUuid == null) {\r
- return null;\r
- }\r
-// StoreUtil.checktaxonExists(UUID.fromString(uuid));\r
- if (CdmStore.getTaxonService().getTaxonNodeByUuid(UUID.fromString(taxonNodeUuid)) == null) {\r
+ if (taxonNodeUuid == null || CdmStore.getTaxonService().getTaxonNodeByUuid(UUID.fromString(taxonNodeUuid)) == null) {\r
logger.warn("Couldn't find taxon node with UUID " + taxonNodeUuid);\r
return null;\r
}\r
import org.eclipse.core.resources.IMarker;\r
import org.eclipse.jface.text.Position;\r
import org.eclipse.jface.text.source.Annotation;\r
+import org.eclipse.jface.text.source.IAnnotationPresentation;\r
+import org.eclipse.swt.graphics.GC;\r
import org.eclipse.swt.graphics.Image;\r
+import org.eclipse.swt.graphics.Point;\r
import org.eclipse.swt.graphics.RGB;\r
+import org.eclipse.swt.graphics.Rectangle;\r
+import org.eclipse.swt.widgets.Canvas;\r
\r
-public class WarningAnnotation extends Annotation {\r
+import eu.etaxonomy.taxeditor.model.ImageResources;\r
+\r
+public class WarningAnnotation extends Annotation implements IAnnotationPresentation {\r
private IMarker marker;\r
private String text;\r
private int line;\r
\r
// error identifiers, images and colors\r
public static String WARNING_TYPE = "warning.type";\r
- public static Image WARNING_IMAGE;\r
+ public static Image WARNING_IMAGE = ImageResources.getImage(ImageResources.ACTIVE_WARNING_ICON);\r
public static final RGB WARNING_RGB = new RGB(244, 200, 45); \r
\r
public WarningAnnotation(IMarker marker) {\r
}\r
\r
public String getText() {\r
- return text;\r
+ return "Warning: " + text;\r
}\r
\r
public Image getImage() {\r
public void setPosition(Position position) {\r
this.position = position;\r
}\r
+ \r
+ public void paint(GC gc, Canvas canvas, Rectangle bounds) {\r
+ Point canvasSize= canvas.getSize();\r
+\r
+ int x= 0;\r
+ int y= bounds.y;\r
+ int w= canvasSize.x;\r
+ int h= bounds.height;\r
+\r
+ if (y + h > canvasSize.y)\r
+ h= canvasSize.y - y;\r
+\r
+ if (y < 0) {\r
+ h= h + y;\r
+ y= 0;\r
+ }\r
+\r
+ if (h <= 0)\r
+ return;\r
+\r
+ Image image = WARNING_IMAGE;\r
+ \r
+ Rectangle r = image.getBounds();\r
+ \r
+ int destX = x + w - r.width;\r
+ int destY = y + h - r.height;\r
+ \r
+ gc.drawImage(image, 0, 0, r.width, r.height, destX, destY, r.width, r.height);\r
+ }\r
}
\ No newline at end of file
import org.eclipse.swt.events.SelectionListener;\r
import org.eclipse.swt.layout.GridData;\r
import org.eclipse.swt.layout.GridLayout;\r
-import org.eclipse.swt.layout.RowLayout;\r
import org.eclipse.swt.widgets.Combo;\r
import org.eclipse.swt.widgets.Composite;\r
import org.eclipse.swt.widgets.Label;\r
import org.eclipse.ui.forms.widgets.Hyperlink;\r
\r
import eu.etaxonomy.cdm.model.common.Language;\r
-import eu.etaxonomy.cdm.model.common.ReferencedEntityBase;\r
import eu.etaxonomy.cdm.model.common.TermLanguageComparator;\r
import eu.etaxonomy.cdm.model.description.CommonTaxonName;\r
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
-import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
-import eu.etaxonomy.taxeditor.dialogs.FilteredReferenceSelectionDialog;\r
import eu.etaxonomy.taxeditor.model.DescriptionHelper;\r
import eu.etaxonomy.taxeditor.preference.LanguageMenuPreferences;\r
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;\r
// gridLayout.numColumns = 1;\r
// shell.setLayout(gridLayout);\r
\r
- browser = new Browser(parent, SWT.NONE);\r
+ browser = new Browser(client, SWT.NONE);\r
\r
GridData data = new GridData();\r
data.horizontalAlignment = GridData.FILL;\r
\r
browser.setLayoutData(data);\r
\r
- final ProgressBar progressBar = new ProgressBar(parent, SWT.NONE);\r
+ final ProgressBar progressBar = new ProgressBar(client, SWT.NONE);\r
data = new GridData();\r
data.horizontalAlignment = GridData.END;\r
progressBar.setLayoutData(data);\r
- \r
\r
browser.addProgressListener(new ProgressListener() {\r
public void changed(ProgressEvent event) {\r
});\r
\r
parent.addControlListener(new ControlListener(){\r
-\r
public void controlMoved(ControlEvent e) {\r
// do nothing\r
}\r
-\r
public void controlResized(ControlEvent e) {\r
loadMap();\r
}\r
- \r
});\r
}\r
\r
public void selectionChanged(IFormPart part, ISelection selection) {\r
super.selectionChanged(part, selection);\r
taxon = ((TaxonDescriptionFeature) input).getDescription().getTaxon();\r
+ loadMap();\r
}\r
}\r
import org.eclipse.swt.widgets.Text;\r
import org.eclipse.ui.forms.IFormPart;\r
\r
-import eu.etaxonomy.cdm.model.description.DescriptionElementBase;\r
import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
-import eu.etaxonomy.taxeditor.model.DescriptionHelper;\r
\r
/**\r
* @author p.ciardelli\r
import eu.etaxonomy.cdm.model.reference.Generic;\r
import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;\r
import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
+import eu.etaxonomy.cdm.strategy.parser.ParserProblem;\r
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;\r
import eu.etaxonomy.taxeditor.propertysheet.AnnotationPropertySource;\r
import eu.etaxonomy.taxeditor.propertysheet.AnnotationsPropertyDescriptor;\r
\r
// Parsed: reports whether parsing was successful \r
if (id.equals(P_ID_PARSED)) {\r
- return name.hasProblem() ? "problem" : "parsed" ;\r
+ String str = null;\r
+ for (ParserProblem problem : name.getParsingProblems()) {\r
+ str = str == null ? problem.toString() : str + problem.toString();\r
+ }\r
+ return str == null ? "parsed" : str;\r
}\r
\r
// Rank menu \r
</menuContribution>
<menuContribution
locationURI="popup:eu.etaxonomy.taxeditor.navigation.navigatorpopup">
+ <command
+ commandId="org.eclipse.ui.newWizard"
+ label="New"
+ style="push">
+ </command>
+ <separator
+ name="taxeditor-navigation.separator1"
+ visible="true">
+ </separator>
<command
commandId="eu.etaxonomy.taxeditor.navigation.command.editTaxon"
label="Edit"
</visibleWhen>
</command>
<separator
- name="taxeditor-navigation.separator1"
+ name="taxeditor-navigation.separator2"
visible="true">
</separator>
<command
style="push">
</command>
<separator
- name="eu.etaxonomy.taxeditor.treemenu.separator2"
+ name="taxeditor-navigation.separator3"
visible="true">
</separator>
<command
style="push">
</command>
<separator
- name="eu.etaxonomy.taxeditor.treemenu.separator3"
+ name="taxeditor-navigation.separator4"
visible="true">
</separator>
<command
style="push">
</command>
<separator
- name="taxeditor-navigation.separator2"
+ name="taxeditor-navigation.separator5"
visible="true">
</separator>
<command
id="eu.etaxonomy.taxeditor.new.category.cdm"
name="CDM">
</category>
- <primaryWizard
- id="org.eclipse.ui.wizards.new.file">
- </primaryWizard>
+ <!--primaryWizard
+ id="taxeditor-navigation.wizard1">
+ </primaryWizard-->
<wizard
category="eu.etaxonomy.taxeditor.new.category.cdm"
class="eu.etaxonomy.taxeditor.navigation.handler.NewTaxonomicTreeWizard"
+ icon="icons/tree_icon_small.jpg"
id="taxeditor-navigation.wizard1"
name="Taxonomic Tree">
</wizard>
</iterate>
</with>
</definition>
- </extension>
-
-
+ </extension>
</plugin>