Project

General

Profile

« Previous | Next » 

Revision 9b135851

Added by Katja Luther over 1 year ago

rename TaxonNameEditor and other classes and remove E$

View differences:

eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
42 42
import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
43 43
import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
44 44
import eu.etaxonomy.taxeditor.bulkeditor.e4.BulkEditor;
45
import eu.etaxonomy.taxeditor.bulkeditor.input.TaxonEditorInput;
45
import eu.etaxonomy.taxeditor.bulkeditor.input.TaxonBulkEditorInput;
46 46
import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.DescriptiveDataSetEditor;
47 47
import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.CharacterMatrixPart;
48
import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInputE4;
48
import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInput;
49 49
import eu.etaxonomy.taxeditor.editor.group.authority.CdmAuthorityEditorInput;
50 50
import eu.etaxonomy.taxeditor.editor.group.authority.e4.CdmAuthorityEditorE4;
51 51
import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
52 52
import eu.etaxonomy.taxeditor.editor.l10n.Messages;
53
import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
53
import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
54 54
import eu.etaxonomy.taxeditor.editor.view.checklist.e4.DistributionEditorPart;
55 55
import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
56 56
import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateViewEditorInput;
......
69 69
 */
70 70
public class EditorUtil extends AbstractUtility {
71 71

  
72
    private static final String NAME_EDITOR_ID = "eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4";
72
    private static final String NAME_EDITOR_ID = "eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor";
73 73

  
74 74
    private static boolean factsVisible = true;
75 75

  
......
182 182
    }
183 183

  
184 184
	public static void openTaxonNodeE4(UUID taxonNodeUuid, EModelService modelService, EPartService partService, MApplication application) {
185
	    TaxonEditorInputE4 input = TaxonEditorInputE4.NewInstance(taxonNodeUuid);
185
	    TaxonEditorInput input = TaxonEditorInput.NewInstance(taxonNodeUuid);
186 186
	    openNameEditor_internal(input, modelService, partService, application);
187 187
	}
188 188

  
189 189
	public static void openTaxonBaseE4(UUID taxonBaseUuid, EModelService modelService, EPartService partService, MApplication application) {
190
	    TaxonEditorInputE4 input = TaxonEditorInputE4.NewInstanceFromTaxonBase(taxonBaseUuid);
190
	    TaxonEditorInput input = TaxonEditorInput.NewInstanceFromTaxonBase(taxonBaseUuid);
191 191
	    openNameEditor_internal(input, modelService, partService, application);
192 192
	}
193 193

  
......
200 200
//        openNameEditor_internal(input, modelService, partService, null);
201 201
//    }
202 202

  
203
    private static void openNameEditor_internal(TaxonEditorInputE4 input, EModelService modelService, EPartService partService, MApplication application) {
203
    private static void openNameEditor_internal(TaxonEditorInput input, EModelService modelService, EPartService partService, MApplication application) {
204 204
        TaxonBase<?> taxonBase = input.getTaxon();
205 205
        TaxonNode node = input.getTaxonNode();
206 206
        if(taxonBase==null){
......
216 216
//        }
217 217
        if (taxonBase.isOrphaned()) {
218 218
            if(taxonBase.isInstanceOf(Synonym.class)){
219
                MessagingUtils.warningDialog(Messages.EditorUtil_ORPHAN_ACCEPTED_TAXON, TaxonEditorInputE4.class, Messages.EditorUtil_ORPHAN_ACCEPTED_TAXON_MESSAGE);
219
                MessagingUtils.warningDialog(Messages.EditorUtil_ORPHAN_ACCEPTED_TAXON, TaxonEditorInput.class, Messages.EditorUtil_ORPHAN_ACCEPTED_TAXON_MESSAGE);
220 220
                return;
221 221
            }
222 222
            else{
223
                MessagingUtils.warningDialog(Messages.EditorUtil_ORPHAN_TAXON, TaxonEditorInputE4.class, Messages.EditorUtil_ORPHAN_TAXON_MESSAGE);
223
                MessagingUtils.warningDialog(Messages.EditorUtil_ORPHAN_TAXON, TaxonEditorInput.class, Messages.EditorUtil_ORPHAN_TAXON_MESSAGE);
224 224
                return;
225 225
            }
226 226
        }
......
229 229
        //check if part is already opened
230 230
        MPart alreadyOpenInOtherClassification = null;
231 231
        for (MPart part : parts) {
232
        	if(part.getObject() instanceof TaxonNameEditorE4
233
                    && ((TaxonNameEditorE4) part.getObject()).getTaxon()!=null
234
                    && ((TaxonNameEditorE4) part.getObject()).getTaxon().getUuid().equals(input.getTaxon().getUuid())){
232
        	if(part.getObject() instanceof TaxonNameEditor
233
                    && ((TaxonNameEditor) part.getObject()).getTaxon()!=null
234
                    && ((TaxonNameEditor) part.getObject()).getTaxon().getUuid().equals(input.getTaxon().getUuid())){
235 235

  
236 236
        	    UUID inputNode = input.getTaxonNode().getUuid();
237
        	    UUID editorNode = ((TaxonNameEditorE4) part.getObject()).getTaxonNode().getUuid();
237
        	    UUID editorNode = ((TaxonNameEditor) part.getObject()).getTaxonNode().getUuid();
238 238
        	    if (!inputNode.equals(editorNode)){
239 239
        	        alreadyOpenInOtherClassification = part;
240 240
        	    }else{
241
        	    	((TaxonNameEditorE4) part.getObject()).init(input);
241
        	    	((TaxonNameEditor) part.getObject()).init(input);
242 242
        	        partService.activate(part, true);
243 243
        	        return;
244 244
        	    }
245 245
            }
246 246
        }
247 247
        if (alreadyOpenInOtherClassification != null){
248
            boolean doSave = forceUserSaveE4Editor(((TaxonNameEditorE4) alreadyOpenInOtherClassification.getObject()), getShell());
248
            boolean doSave = forceUserSaveE4Editor(((TaxonNameEditor) alreadyOpenInOtherClassification.getObject()), getShell());
249 249
            if (doSave){
250
                input = TaxonEditorInputE4.NewInstance(input.getTaxonNode().getUuid());
250
                input = TaxonEditorInput.NewInstance(input.getTaxonNode().getUuid());
251 251
                partService.hidePart(alreadyOpenInOtherClassification);
252 252
            }else {
253 253
                return;
......
256 256

  
257 257
        MPart part = showPart(NAME_EDITOR_ID, modelService, partService, application);
258 258

  
259
        TaxonNameEditorE4 editor = (TaxonNameEditorE4) part.getObject();
259
        TaxonNameEditor editor = (TaxonNameEditor) part.getObject();
260 260
//        editor.setDisabled();
261 261
        editor.init(input);
262 262
//        editor.setEnabled();
......
288 288
        //check if part is already opened
289 289
        boolean isDirty = false;
290 290
        for (MPart part : parts) {
291
            if(part.getObject() instanceof TaxonNameEditorE4
292
                    && ((TaxonNameEditorE4) part.getObject()).getTaxon()!=null
293
                    && ((TaxonNameEditorE4) part.getObject()).getTaxon().getUuid().equals(taxonUUID)){
291
            if(part.getObject() instanceof TaxonNameEditor
292
                    && ((TaxonNameEditor) part.getObject()).getTaxon()!=null
293
                    && ((TaxonNameEditor) part.getObject()).getTaxon().getUuid().equals(taxonUUID)){
294 294
                if (part.isDirty()){
295 295
                    dirtyParts.add(part);
296 296
                }
......
310 310
        Collection<IE4SavablePart> dirtyParts = new HashSet<>();
311 311
        //check if part is already opened
312 312
        for (MPart part : parts) {
313
            if(part.getObject() instanceof TaxonNameEditorE4
314
                    && ((TaxonNameEditorE4) part.getObject()).getTaxon()!=null
315
                    && ((TaxonNameEditorE4) part.getObject()).getTaxon().getUuid().equals(taxonUUID)){
313
            if(part.getObject() instanceof TaxonNameEditor
314
                    && ((TaxonNameEditor) part.getObject()).getTaxon()!=null
315
                    && ((TaxonNameEditor) part.getObject()).getTaxon().getUuid().equals(taxonUUID)){
316 316
                if (part.isDirty()){
317 317
                    dirtyParts.add((IE4SavablePart) part);
318 318
                }
319 319

  
320 320
                break;
321 321
            }else if (taxonUUID == null){
322
                if (part.isDirty() && (part.getObject() instanceof TaxonNameEditorE4 || (part.getObject() instanceof BulkEditor && ((BulkEditor)part.getObject()).getEditorInput() instanceof TaxonEditorInput))){
322
                if (part.isDirty() && (part.getObject() instanceof TaxonNameEditor || (part.getObject() instanceof BulkEditor && ((BulkEditor)part.getObject()).getEditorInput() instanceof TaxonBulkEditorInput))){
323 323
                    dirtyParts.add((IE4SavablePart) part.getObject());
324 324
                }
325 325
            }
......
336 336
	 *            a {@link java.util.UUID} object.
337 337
	 */
338 338
	public static void openEmptyE4(UUID parentNodeUuid) {
339
		TaxonEditorInputE4 input = TaxonEditorInputE4
339
		TaxonEditorInput input = TaxonEditorInput
340 340
				.NewEmptyInstance(parentNodeUuid);
341 341
        EPartService partService = TaxeditorEditorPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getService(EPartService.class);
342 342
        MPart part = partService.createPart(NAME_EDITOR_ID);
343 343
        part = partService.showPart(part, PartState.ACTIVATE);
344
        TaxonNameEditorE4 editor = (TaxonNameEditorE4) part.getObject();
344
        TaxonNameEditor editor = (TaxonNameEditor) part.getObject();
345 345
        editor.init(input);
346 346
	}
347 347

  
......
488 488
        Collection<MPart> parts = partService.getParts();
489 489
        for (MPart part : parts) {
490 490
            Object object = part.getObject();
491
            if(object instanceof TaxonNameEditorE4){
492
                TaxonNameEditorE4 taxonEditor = (TaxonNameEditorE4)object;
491
            if(object instanceof TaxonNameEditor){
492
                TaxonNameEditor taxonEditor = (TaxonNameEditor)object;
493 493
                TaxonNode node = taxonEditor.getEditorInput().getTaxonNode();
494 494
                if (node.treeIndex()!= null){
495 495
	                if(node.treeIndex().startsWith(treeIndex)){
......
510 510
        Collection<MPart> parts = partService.getParts();
511 511
        for (MPart part : parts) {
512 512
            Object object = part.getObject();
513
            if(object instanceof TaxonNameEditorE4){
514
                TaxonNameEditorE4 taxonEditor = (TaxonNameEditorE4)object;
513
            if(object instanceof TaxonNameEditor){
514
                TaxonNameEditor taxonEditor = (TaxonNameEditor)object;
515 515
                TaxonNode node = taxonEditor.getEditorInput().getTaxonNode();
516 516
                if (node.treeIndex()!= null){
517 517
                    if(node.treeIndex().startsWith(treeIndex)){
......
557 557
        }
558 558
    }
559 559

  
560
    public static void updateEditor(TaxonNode taxonNode, TaxonNameEditorE4 editor){
560
    public static void updateEditor(TaxonNode taxonNode, TaxonNameEditor editor){
561 561
        String treeIndex = taxonNode.treeIndex();
562 562
        TaxonNode node = editor.getEditorInput().getTaxonNode();
563 563
        if(node.treeIndex().equals(treeIndex)){
564
        	TaxonEditorInputE4 input = TaxonEditorInputE4.NewInstance(node.getUuid());
564
        	TaxonEditorInput input = TaxonEditorInput.NewInstance(node.getUuid());
565 565
        	editor.init(input);
566 566
        }
567 567
    }

Also available in: Unified diff