Project

General

Profile

« Previous | Next » 

Revision 6354cd8a

Added by Lutz Suhrbier over 12 years ago

RAP-Version SingleSourced und scheint zu laufen

View differences:

.gitattributes
679 679
eu.etaxonomy.taxeditor.store.rap/src/eu/etaxonomy/taxeditor/singlesource/ui/forms/NumberWithLabelElementFacadeImpl.java -text
680 680
eu.etaxonomy.taxeditor.store.rap/src/eu/etaxonomy/taxeditor/singlesource/ui/forms/TextWithLabelElementFacadeImpl.java -text
681 681
eu.etaxonomy.taxeditor.store.rap/src/eu/etaxonomy/taxeditor/singlesource/ui/forms/UriWithLabelElementFacadeImpl.java -text
682
eu.etaxonomy.taxeditor.store.rap/src/eu/etaxonomy/taxeditor/store/singlesource/org/eclipse/swt/widgets/DisplayProxyImpl.java -text
683 682
eu.etaxonomy.taxeditor.store.rcp/.classpath -text
684 683
eu.etaxonomy.taxeditor.store.rcp/.project -text
685 684
eu.etaxonomy.taxeditor.store.rcp/.settings/org.eclipse.jdt.core.prefs -text
eu.etaxonomy.taxeditor.application/plugin.xml
22 22
            name="Taxonomic">
23 23
      </perspective>
24 24
      <perspective
25
            class="eu.etaxonomy.taxeditor.perspective.BulkEditing"
25
            class="eu.etaxonomy.taxeditor.singlesource.perspective.BulkEditingFacade"
26 26
            id="eu.etaxonomy.taxeditor.application.perspective.bulkeditor"
27 27
            name="Bulk Editing">
28 28
      </perspective>
......
368 368
        pattern="org\.eclipse\.search.*">
369 369
  </activityPatternBinding>
370 370
	</extension>
371
 <extension
372
       point="org.eclipse.ui.startup">
373
    <startup
374
          class="eu.etaxonomy.taxeditor.singlesource.editor.TaxeditorApplicationStartup">
375
    </startup>
376
 </extension>
371 377

  
372 378
</plugin>
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java
54 54
		//  for the next time application is started
55 55
		configurer.setSaveAndRestore(true);
56 56
		
57
		/** RAPSS:Include Must be called here to initialise SessionBased Display Singleton
58
		 */
57 59
		DisplayProxy.setDefault(Display.getDefault());
58 60
	}	
59 61
	
eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/Taxonomic.java
13 13
import org.eclipse.ui.IFolderLayout;
14 14
import org.eclipse.ui.IPageLayout;
15 15

  
16
import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart;
17
import eu.etaxonomy.taxeditor.editor.view.media.MediaViewPart;
18 16
import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator;
19 17
import eu.etaxonomy.taxeditor.navigation.search.SearchResultView;
18
import eu.etaxonomy.taxeditor.singlesource.editor.view.descriptive.DescriptiveViewPart;
19
import eu.etaxonomy.taxeditor.singlesource.editor.view.media.MediaViewPart;
20 20
import eu.etaxonomy.taxeditor.view.detail.DetailsViewPart;
21 21
import eu.etaxonomy.taxeditor.view.supplementaldata.SupplementalDataViewPart;
22 22

  
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineSelectionViewer.java
22 22
import org.eclipse.jface.viewers.SelectionChangedEvent;
23 23
import org.eclipse.swt.widgets.Composite;
24 24

  
25
import eu.etaxonomy.taxeditor.model.LineSelection;
26 25

  
27 26

  
28 27
/**
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/SetMergeCandidateHandler.java
19 19

  
20 20
import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotation;
21 21
import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotationModel;
22
import eu.etaxonomy.taxeditor.annotatedlineeditor.LineSelection;
22 23
import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
23 24
import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorConstants;
24
import eu.etaxonomy.taxeditor.model.LineSelection;
25 25

  
26 26
/**
27 27
 * <p>SetMergeCandidateHandler class.</p>
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
37 37
import eu.etaxonomy.cdm.api.service.ICommonService;
38 38
import eu.etaxonomy.cdm.model.common.CdmBase;
39 39
import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
40
import eu.etaxonomy.taxeditor.annotatedlineeditor.LineSelection;
40 41
import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
41 42
import eu.etaxonomy.taxeditor.model.DescriptionHelper;
42
import eu.etaxonomy.taxeditor.model.LineSelection;
43 43
import eu.etaxonomy.taxeditor.singlesource.org.eclipse.swt.widgets.DisplayProxy;
44 44
import eu.etaxonomy.taxeditor.store.CdmStore;
45 45
import eu.etaxonomy.taxeditor.view.AbstractCdmViewPart;
eu.etaxonomy.taxeditor.editor.rcp/src/eu/etaxonomy/taxeditor/singlesource/editor/name/container/EditorAnnotationFacadeImpl.java
49 49
     * @param line a int.
50 50
     * @param text a {@link java.lang.String} object.
51 51
     */
52
    public EditorAnnotationFacadeImpl(int line, String text) {
52
    public EditorAnnotationFacadeImpl(Integer line, String text) {
53 53
    	this(EditorAnnotationType.ERROR, line, text);
54 54
    }
55 55

  
eu.etaxonomy.taxeditor.editor.rcp/src/eu/etaxonomy/taxeditor/singlesource/editor/name/container/LineBreakListenerFacadeImpl.java
44 44
 * @created 19.05.2008
45 45
 * @version 1.0
46 46
 */
47
public class LineBreakListenerFacadeImpl<T extends TaxonBase> extends LineBreakListenerFacade {
47
public class LineBreakListenerFacadeImpl<T extends TaxonBase> extends LineBreakListenerFacade<T> {
48 48
	private static final Logger logger = Logger.getLogger(LineBreakListenerFacadeImpl.class);
49 49

  
50 50
	public LineBreakListenerFacadeImpl() {
......
55 55
		super(container);
56 56
	}
57 57

  
58
	protected Object getInstanceInternal(AbstractGroupedContainer container)
58
	protected Object getInstanceInternal(AbstractGroupedContainer<T> container)
59 59
	{
60
		LineBreakListenerFacadeImpl INST = new LineBreakListenerFacadeImpl(container); 
60
		LineBreakListenerFacadeImpl<T> INST = new LineBreakListenerFacadeImpl<T>(container); 
61 61
		return INST;
62 62
	}
63 63

  
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
94 94
   org.eclipse.ui.forms",
95 95
 eu.etaxonomy.taxeditor.singlesource.editor.view.concept;uses:="eu.etaxonomy.cdm.model.taxon,org.eclipse.jface.viewers,org.eclipse.swt.graphics",
96 96
 eu.etaxonomy.taxeditor.singlesource.editor.view.descriptive;uses:="org.eclipse.jface.viewers",
97
 eu.etaxonomy.taxeditor.singlesource.editor.view.media,
97 98
 eu.etaxonomy.taxeditor.singlesource.org.eclipse.jface.text,
98 99
 eu.etaxonomy.taxeditor.singlesource.org.eclipse.jface.window;uses:="org.eclipse.swt.widgets"
99 100
Require-Bundle: org.eclipse.ui;resolution:=optional,
......
112 113
Import-Package: org.eclipse.core.databinding.beans,
113 114
 org.eclipse.core.databinding.observable.list,
114 115
 org.eclipse.core.databinding.observable.map,
115
 org.eclipse.core.resources,
116
 org.eclipse.core.resources;resolution:=optional,
116 117
 org.eclipse.core.runtime,
117 118
 org.eclipse.equinox.app,
118 119
 org.eclipse.jface.databinding.viewers,
......
120 121
 org.eclipse.jface.text.contentassist;resolution:=optional,
121 122
 org.eclipse.jface.text.source;resolution:=optional,
122 123
 org.eclipse.ui.forms.widgets,
123
 org.eclipse.ui.texteditor,
124
 org.eclipse.ui.texteditor;resolution:=optional,
124 125
 org.eclipse.zest.core.viewers,
125 126
 org.eclipse.zest.layouts,
126 127
 org.osgi.framework
eu.etaxonomy.taxeditor.editor/plugin.xml
57 57
            point="org.eclipse.ui.views">
58 58
         <view
59 59
               allowMultiple="false"
60
               class="eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart"
60
               class="eu.etaxonomy.taxeditor.singlesource.editor.view.descriptive.DescriptiveViewPartImpl"
61 61
               icon="icons/address-book-new.png"
62 62
               id="eu.etaxonomy.taxeditor.editor.view.descriptive"
63 63
               name="Descriptive"
......
65 65
         </view>
66 66
         <view
67 67
               allowMultiple="false"
68
               class="eu.etaxonomy.taxeditor.editor.view.media.MediaViewPart"
68
               class="eu.etaxonomy.taxeditor.singlesource.editor.view.media.MediaViewPartImpl"
69 69
               icon="icons/camera-photo.png"
70 70
               id="eu.etaxonomy.taxeditor.editor.view.media"
71 71
               name="Media"
72 72
               restorable="true">
73 73
         </view>
74 74
         <view
75
               class="eu.etaxonomy.taxeditor.editor.view.concept.ConceptViewPart"
75
               class="eu.etaxonomy.taxeditor.singlesource.editor.view.concept.ConceptViewPartImpl"
76 76
               id="eu.etaxonomy.taxeditor.editor.view.concept"
77 77
               name="Concept Relations"
78 78
               restorable="true">
......
967 967
            name="Taxonomic Editor Default Key Bindings">
968 968
      </scheme>
969 969
   </extension>
970
   <extension
971
         point="org.eclipse.ui.startup">
972
      <startup
973
            class="eu.etaxonomy.taxeditor.singlesource.editor.TaxeditorEditorStartup">
974
      </startup>
975
   </extension>
970 976
</plugin>
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorStateManager.java
21 21
import org.eclipse.ui.IPersistable;
22 22
import org.eclipse.ui.PartInitException;
23 23

  
24
import eu.etaxonomy.taxeditor.editor.view.concept.ConceptViewPart;
25
import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart;
26
import eu.etaxonomy.taxeditor.editor.view.media.MediaViewPart;
27 24
import eu.etaxonomy.taxeditor.model.ContextListenerAdapter;
25
import eu.etaxonomy.taxeditor.singlesource.editor.view.concept.ConceptViewPart;
26
import eu.etaxonomy.taxeditor.singlesource.editor.view.descriptive.DescriptiveViewPart;
27
import eu.etaxonomy.taxeditor.singlesource.editor.view.media.MediaViewPart;
28 28
import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart;
29 29

  
30 30
/**
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java
39 39
	public void start(BundleContext context) throws Exception {
40 40
		super.start(context);
41 41
		
42
/** RAPSS: Must be moved inside Context, e.g. EntryPoint.createUI()		
42 43
		EditorStateManager stateManager = new EditorStateManager();
43 44
		CdmStore.getContextManager().addContextListener(stateManager);
44
		
45
*/		
45 46
		plugin = this;
46 47
		logger.trace("Plugin started: " + this.getBundle().getSymbolicName());
47 48
	}
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/AbstractGroupedContainer.java
139 139
		parseHandler = ParseHandler.NewInstance(taxonBase.getName());
140 140
	}
141 141
	
142
	public void createContent(){
142
	public void createContent() {
143 143
		createControl();
144 144
		
145 145
		try {
146 146
			createTextViewer();
147 147
			createLineWrapSupport();
148
			createLineBreakListener();
148 149
		} catch (OperationNotSupportedException e) {
149
			// TODO Auto-generated catch block
150
			e.printStackTrace();
150
			logger.warn("AbstractGroupedContainer.createContent(): Operation not supported:" +  e.getMessage());
151 151
		}
152
		createLineBreakListener();
153 152

  
154 153
		setMenu(getEditor().getMenu());
155 154
		
......
165 164
		try {
166 165
			isFreeTextEnabled();
167 166
		} catch (OperationNotSupportedException e) {
168
			logger.warn("AbstractGroupedContainer.initTextViewer(): EditorAnnotations not supported :" + e.getMessage() );
167
			logger.warn("AbstractGroupedContainer.initTextViewer(): EditorAnnotations not supported :" + e.getMessage());
169 168
		}
170 169
	}
171 170

  
......
1031 1030
	 * i.e. the creation of a new composite - call this method and override
1032 1031
	 * the method handleSplitText().
1033 1032
	 */
1034
	protected void createLineBreakListener() {
1033
	protected void createLineBreakListener() throws OperationNotSupportedException {
1035 1034
		lineBreakListener = LineBreakListenerFacade.getInstance(this);
1036 1035
		getNameViewer().addVerifyListener(lineBreakListener);
1037 1036
	}
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptionElementDragListener.java
21 21
import eu.etaxonomy.cdm.model.description.DescriptionBase;
22 22
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
23 23
import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
24
import eu.etaxonomy.taxeditor.singlesource.editor.view.descriptive.DescriptiveViewPart;
24 25

  
25 26
/**
26 27
 * @author n.hoffmann
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptionElementDropAdapter.java
35 35
	/**
36 36
	 * @param viewer
37 37
	 */
38
	protected DescriptionElementDropAdapter(Viewer viewer) {
38
	public DescriptionElementDropAdapter(Viewer viewer) {
39 39
		super(viewer);
40 40
	}
41 41

  
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DynamicFeatureMenu.java
31 31
import eu.etaxonomy.cdm.model.description.FeatureTree;
32 32
import eu.etaxonomy.cdm.model.description.TaxonDescription;
33 33
import eu.etaxonomy.taxeditor.editor.EditorUtil;
34
import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart;
35 34
import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.CreateDescriptionElementOperation;
36 35
import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
37 36
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
37
import eu.etaxonomy.taxeditor.singlesource.editor.view.descriptive.DescriptiveViewPart;
38 38
import eu.etaxonomy.taxeditor.store.CdmStore;
39 39

  
40 40
/**
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java
28 28
import eu.etaxonomy.cdm.model.description.TaxonDescription;
29 29
import eu.etaxonomy.cdm.model.taxon.Taxon;
30 30
import eu.etaxonomy.taxeditor.editor.EditorUtil;
31
import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart;
32 31
import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.MoveDescriptionElementsOperation;
33 32
import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
34 33
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
34
import eu.etaxonomy.taxeditor.singlesource.editor.view.descriptive.DescriptiveViewPart;
35 35
import eu.etaxonomy.taxeditor.store.CdmStore;
36 36
import eu.etaxonomy.taxeditor.ui.dialogs.filteredSelection.TaxonBaseSelectionDialog;
37 37

  
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/AddImageGalleryHandler.java
7 7
import org.eclipse.core.commands.ExecutionEvent;
8 8
import org.eclipse.core.commands.ExecutionException;
9 9
import org.eclipse.core.commands.common.NotDefinedException;
10
import org.eclipse.jface.viewers.ISelection;
11
import org.eclipse.jface.viewers.IStructuredSelection;
12 10
import org.eclipse.ui.IEditorInput;
13 11
import org.eclipse.ui.IEditorPart;
14 12
import org.eclipse.ui.IWorkbenchPart;
15 13
import org.eclipse.ui.handlers.HandlerUtil;
16 14

  
17
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
18
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
19
import eu.etaxonomy.cdm.model.description.Feature;
20
import eu.etaxonomy.cdm.model.description.SpecimenDescription;
21
import eu.etaxonomy.cdm.model.description.TextData;
22
import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;
23 15
import eu.etaxonomy.cdm.model.taxon.Taxon;
24
import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
25
import eu.etaxonomy.taxeditor.bulkeditor.input.OccurrenceEditorInput;
26 16
import eu.etaxonomy.taxeditor.editor.EditorUtil;
27 17
import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;
28 18
import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.CreateTaxonDescriptionOperation;
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/singlesource/editor/name/container/EditorAnnotationFacade.java
32 32
	 *
33 33
	 * @param parent a {@link org.eclipse.swt.widgets.Composite} object.
34 34
	 */
35
	public EditorAnnotationFacade(EditorAnnotationFacade.EditorAnnotationType type, int line, String text) throws OperationNotSupportedException {
35
	public EditorAnnotationFacade(EditorAnnotationFacade.EditorAnnotationType type, Integer line, String text) throws OperationNotSupportedException {
36 36

  
37 37
		IMPL = (IEditorAnnotation)ImplementationLoader.newInstance(EditorAnnotationFacade.class, type, line, text);
38 38
	}
......
81 81
//    public static final RGB WARNING_RGB = new RGB(244, 200, 45); 
82 82
    
83 83
    
84
    public EditorAnnotationFacade(ParserProblem problem) throws OperationNotSupportedException{
84
    public EditorAnnotationFacade(ParserProblem problem) throws OperationNotSupportedException {
85 85
    	this(EditorAnnotationType.getTypeByProblem(problem), 0, problem.getMessage());
86 86
    }
87 87
    
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/singlesource/editor/name/container/LineBreakListenerFacade.java
9 9

  
10 10
package eu.etaxonomy.taxeditor.singlesource.editor.name.container;
11 11

  
12
import javax.naming.OperationNotSupportedException;
13

  
12 14
import org.eclipse.swt.events.VerifyEvent;
13 15
import org.eclipse.swt.events.VerifyListener;
14 16

  
......
59 61
	}
60 62
	
61 63
	
62
	public static LineBreakListenerFacade getInstance (AbstractGroupedContainer container) {
64
	public static LineBreakListenerFacade getInstance (AbstractGroupedContainer container) throws OperationNotSupportedException {
63 65
		return (LineBreakListenerFacade)IMPL.getInstanceInternal(container);
64 66
	}
65
	protected abstract Object getInstanceInternal(AbstractGroupedContainer<T> container);
67

  
68
	protected abstract Object getInstanceInternal(AbstractGroupedContainer<T> container) throws OperationNotSupportedException;
66 69

  
67 70

  
68 71
	protected static String LINE_BREAK = System.getProperty("line.separator");
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/singlesource/editor/name/container/LineWrapSupportFacade.java
14 14

  
15 15
	protected ILineWrapSupport IMPL;
16 16
	
17
	public LineWrapSupportFacade(NameViewerFacade viewer, IManagedForm form) throws OperationNotSupportedException {
17
	public LineWrapSupportFacade(NameViewerFacade viewer, IManagedForm form) {
18 18
		IMPL = (ILineWrapSupport)ImplementationLoader.newInstance(LineWrapSupportFacade.class, viewer, form);
19 19
	}
20 20
}
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
63 63
 eu.etaxonomy.taxeditor.store,
64 64
 eu.etaxonomy.taxeditor.editor
65 65
Bundle-ActivationPolicy: lazy
66
Import-Package: org.eclipse.core.resources,
66
Import-Package: org.eclipse.core.resources;resolution:=optional,
67 67
 org.eclipse.core.runtime,
68 68
 org.eclipse.core.runtime.jobs,
69 69
 org.eclipse.equinox.app,
eu.etaxonomy.taxeditor.navigation/plugin.xml
543 543
         </with>
544 544
      </definition>
545 545
   </extension>
546
   <extension
547
         point="org.eclipse.ui.startup">
548
      <startup
549
            class="eu.etaxonomy.taxeditor.singlesource.navigation.TaxeditorNavigationStartup">
550
      </startup>
551
   </extension>
546 552
</plugin>
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/internal/TaxeditorNavigationPlugin.java
36 36
	public void start(BundleContext context) throws Exception {
37 37
		super.start(context);
38 38

  
39
/** RAPSS: Must be moved inside context, e.g. EntryPoint.createUI()
39 40
		NavigatorStateManager stateManager = new NavigatorStateManager();
40 41
		CdmStore.getContextManager().addContextListener(stateManager);
42
*/
41 43
		plugin = this;
42 44
	}
43 45

  
eu.etaxonomy.taxeditor.store.rap/src/eu/etaxonomy/taxeditor/singlesource/org/eclipse/ide/undo/WorkspaceUndoUtilFacadeImpl.java
13 13
 * @author lusu
14 14
 *
15 15
 */
16
public class WorkspaceUndoUtilFacadeImpl {
16
public class WorkspaceUndoUtilFacadeImpl extends WorkspaceUndoUtilFacade {
17 17
	
18
	public IUndoContext getBookmarksUndoContext() throws OperationNotSupportedException
18
	public IUndoContext getBookmarksUndoContextInternal() throws OperationNotSupportedException
19 19
	{
20 20
		throw new OperationNotSupportedException("WorkspaceUndoUtil not supported in RAP");
21 21
	}
22 22

  
23
	public IUndoContext	getProblemsUndoContext() throws OperationNotSupportedException
23
	public IUndoContext	getProblemsUndoContextInternal() throws OperationNotSupportedException
24 24
	{
25 25
		throw new OperationNotSupportedException("WorkspaceUndoUtil not supported in RAP");
26 26
	}
27 27

  
28
	public Shell getShell(IAdaptable uiInfo) throws OperationNotSupportedException
28
	public Shell getShellInternal(IAdaptable uiInfo) throws OperationNotSupportedException
29 29
	{
30 30
		throw new OperationNotSupportedException("WorkspaceUndoUtil not supported in RAP");
31 31
	}
32 32

  
33
	public IUndoContext	getTasksUndoContext() throws OperationNotSupportedException
33
	public IUndoContext	getTasksUndoContextInternal() throws OperationNotSupportedException
34 34
	{
35 35
		throw new OperationNotSupportedException("WorkspaceUndoUtil not supported in RAP");
36 36
	}
37 37

  
38
	public IAdaptable getUIInfoAdapter(Shell shell) throws OperationNotSupportedException
38
	public IAdaptable getUIInfoAdapterInternal(Shell shell) throws OperationNotSupportedException
39 39
	{
40 40
		throw new OperationNotSupportedException("WorkspaceUndoUtil not supported in RAP");
41 41
	}
42 42

  
43
	public IUndoContext	getWorkspaceUndoContext() throws OperationNotSupportedException
43
	public IUndoContext	getWorkspaceUndoContextInternal() throws OperationNotSupportedException
44 44
	{
45 45
		throw new OperationNotSupportedException("WorkspaceUndoUtil not supported in RAP");
46 46
	}
eu.etaxonomy.taxeditor.store.rap/src/eu/etaxonomy/taxeditor/store/singlesource/org/eclipse/swt/widgets/DisplayProxyImpl.java
1
package eu.etaxonomy.taxeditor.store.singlesource.org.eclipse.swt.widgets;
2

  
3
import org.eclipse.rwt.SessionSingletonBase;
4
import org.eclipse.swt.widgets.Display;
5

  
6
import eu.etaxonomy.taxeditor.singlesource.org.eclipse.swt.widgets.IDisplayProxy;
7

  
8
public class DisplayProxyImpl extends SessionSingletonBase implements IDisplayProxy {
9

  
10
	private static Display defaultDisplay;
11

  
12
	@Override
13
	public Display getDefault() {
14
		return defaultDisplay;
15
	}
16

  
17
	@Override
18
	public void setDefault( Display display ) {
19
		defaultDisplay = display;
20
	}
21

  
22
}
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
424 424
 org.eclipse.swt,
425 425
 org.eclipse.swt.graphics,
426 426
 org.eclipse.swt.widgets,
427
 org.eclipse.ui,
428
 org.eclipse.ui.editors.text,
429
 org.eclipse.ui.forms.widgets,
430
 org.eclipse.ui.ide.undo,
427
 org.eclipse.ui;resolution:=optional,
428
 org.eclipse.ui.editors.text;resolution:=optional,
429
 org.eclipse.ui.forms.widgets;resolution:=optional,
430
 org.eclipse.ui.ide.undo;resolution:=optional,
431 431
 org.osgi.framework
432 432
Bundle-ActivationPolicy: lazy
433 433
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
eu.etaxonomy.taxeditor.store/plugin.xml
789 789
      </with>
790 790
   </definition>
791 791
</extension>
792
<extension
793
      point="org.eclipse.ui.startup">
794
   <startup
795
         class="eu.etaxonomy.taxeditor.singlesource.store.TaxeditorStoreStartup">
796
   </startup>
797
</extension>
792 798
	
793 799
</plugin>
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/singlesource/ImplementationLoader.java
7 7
import java.lang.reflect.InvocationTargetException;
8 8
import java.util.ArrayList;
9 9

  
10
import javax.naming.OperationNotSupportedException;
11

  
10 12
import org.apache.log4j.Logger;
11 13

  
12 14
/**
......
23 25
		Class clazz;
24 26
		try {
25 27
			clazz = type.getClassLoader().loadClass(className);
28
			if( clazz == null )
29
				logger.error("Class not loaded " + className + ".");
30
			else
31
				logger.debug("Class loaded " + clazz.getName() + ".");
26 32

  
27 33
			if (parameter.length > 0) {
28 34
				ArrayList<Class<?>> parameterList = new ArrayList<Class<?>>();
......
45 51
			} else
46 52
				result = clazz.newInstance();
47 53
		} catch (IllegalArgumentException e) {
48
			e.printStackTrace();
54
			logger.error("ImplementationLoader.newInstance(): " + e.getMessage());
49 55
		} catch (InstantiationException e) {
50
			e.printStackTrace();
56
			logger.error("ImplementationLoader.newInstance(): " + e.getMessage());
51 57
		} catch (IllegalAccessException e) {
52
			e.printStackTrace();
58
			logger.error("ImplementationLoader.newInstance(): " + e.getMessage());
53 59
		} catch (InvocationTargetException e) {
54
			e.printStackTrace();
60
			logger.error("ImplementationLoader.newInstance(): " + e.getMessage());
55 61
		} catch (ClassNotFoundException e) {
56
			e.printStackTrace();
62
			logger.error("ImplementationLoader.newInstance(): " + e.getMessage());
57 63
		}
58 64
		return result;
59 65
	}
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/singlesource/io/wizard/ExportToFileDestinationWizardPageFacade.java
38 38
	
39 39
	private final static ExportToFileDestinationWizardPageFacade IMPL;
40 40
	static {
41
		IMPL = (ExportToFileDestinationWizardPageFacade)ImplementationLoader.newInstance(ExportToFileDestinationWizardPageFacade.class) ;
41
			IMPL = (ExportToFileDestinationWizardPageFacade)ImplementationLoader.newInstance(ExportToFileDestinationWizardPageFacade.class) ;
42 42
	}
43 43

  
44 44
	/** Constant <code>DATE_FORMAT_NOW="yyyyMMddHHmm"</code> */
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/singlesource/ui/forms/TextWithLabelElementFacade.java
173 173
	 *            a {@link java.lang.String} object.
174 174
	 */
175 175
	public void setText(String string) {
176
/** RAPSS:Modify Replace RWT Widget Listener Implementation changed to UntypedAdapterEvent		
176 177
		Listener[] listeners = text.getListeners(SWT.Modify);
177 178

  
178 179
		for (Listener listener : listeners) {
179 180
			text.removeListener(SWT.Modify, listener);
180 181
		}
181

  
182
*/
183
		ModifyListener[] modifyListeners = (ModifyListener[])ModifyEvent.getListeners(text);
184
		for (ModifyListener modifyListener : modifyListeners) {
185
			ModifyEvent.removeListener(text, modifyListener);
186
		}
187
		
182 188
		text.setText(CdmUtils.Nz(string));
183 189

  
190
		/** RAPSS:Modify Replace RWT Widget Listener Implementation changed to UntypedAdapterEvent		
184 191
		for (Listener listener : listeners) {
185 192
			text.addListener(SWT.Modify, listener);
186 193
		}
194
		*/
195
 		for (ModifyListener modifyListener : modifyListeners) {
196
			ModifyEvent.addListener(text, modifyListener);
197
 		}
187 198
	}
188 199

  
189 200
	/*
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/internal/TaxeditorStorePlugin.java
1 1
package eu.etaxonomy.taxeditor.store.internal;
2 2

  
3
import org.apache.log4j.Logger;
3 4
import org.eclipse.jface.resource.ImageDescriptor;
4 5
import org.eclipse.jface.resource.ImageRegistry;
5 6
import org.eclipse.ui.plugin.AbstractUIPlugin;
6 7
import org.osgi.framework.BundleContext;
7 8

  
8
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
9

  
10 9
/**
11 10
 * The activator class controls the plug-in life cycle
12 11
 *
......
14 13
 * @version $Id: $
15 14
 */
16 15
public class TaxeditorStorePlugin extends AbstractUIPlugin {
17
	
16
	private static final Logger logger = Logger.getLogger(TaxeditorStorePlugin.class);
18 17
	// The plug-in ID
19 18
	/** Constant <code>PLUGIN_ID="eu.etaxonomy.taxeditor.editor"</code> */
20 19
	public static final String PLUGIN_ID = "eu.etaxonomy.taxeditor.editor";
......
37 36
		super.start(context);
38 37
		
39 38
		plugin = this;
40

  
39
		logger.debug("TaxeditorStorePlugin.start(BundleContext)");
40
/** RAPSS: Must be moved to session Context e.g. EntryPoint.createUI().
41 41
		PreferencesUtil.setDefaults();
42
*/		
42 43
	}
43 44

  
44 45
	/*
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/CdmFormFactory.java
1317 1317
			/** RAPSS:Modify: Two parameter required in Helios				
1318 1318
				FormFonts.getInstance().markFinished(boldFont);
1319 1319
			*/
1320
			FormFonts.getInstance().markFinished(boldFont,getColors().getDisplay());
1320
			FormFonts.getInstance().markFinished(boldFont);
1321 1321
			boldFont = null;
1322 1322
			}
1323 1323
		}

Also available in: Unified diff