Changeset 1208 for trunk/org.modelica.mdt.ui/src

Timestamp:

12/15/11 14:58:42 (13 years ago)

Author:

masberg

Message:

Fix warnings. Add missing override annotations. Remove unnecessary casts. Organize imports.

File:

• trunk/org.modelica.mdt.ui/src/org/modelica/mdt/ui/editor/ModelicaEditor.java (modified) (36 diffs)

trunk/org.modelica.mdt.ui/src/org/modelica/mdt/ui/editor/ModelicaEditor.java

@@ -47 +47 @@
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.debug.ui.actions.IToggleBreakpointsTarget;
-import org.eclipse.debug.ui.actions.IToggleBreakpointsTargetExtension;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.action.IMenuManager;
@@ -59 +58 @@
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextHover;
+import org.eclipse.jface.text.ITextSelection;
 import org.eclipse.jface.text.ITextViewer;
+import org.eclipse.jface.text.ITextViewerExtension2;
 import org.eclipse.jface.text.ITextViewerExtension4;
+import org.eclipse.jface.text.ITextViewerExtension5;
 import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.ITextViewerExtension2;
-import org.eclipse.jface.text.ITextViewerExtension5;
+import org.eclipse.jface.text.TextSelection;
 import org.eclipse.jface.text.TextUtilities;
 import org.eclipse.jface.text.information.IInformationProvider;
@@ -73 +74 @@
 import org.eclipse.jface.text.source.projection.ProjectionSupport;
 import org.eclipse.jface.text.source.projection.ProjectionViewer;
+import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;
@@ -92 +95 @@
 import org.eclipse.ui.IWorkbenchPartSite;
 import org.eclipse.ui.IWorkbenchWindow;
-import org.modelica.mdt.ui.actions.FoldingActionGroup;
-import org.modelica.mdt.ui.actions.IModelicaEditorActionDefinitionIds;
-import org.modelica.mdt.ui.actions.OpenAction;
-import org.modelica.mdt.ui.hover.ModelicaSourceHover;
-import org.modelica.mdt.ui.hover.SourceViewerInformationControl;
 import org.eclipse.ui.editors.text.DefaultEncodingSupport;
 import org.eclipse.ui.editors.text.IEncodingSupport;
 import org.eclipse.ui.editors.text.TextEditor;
 import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
+import org.eclipse.ui.texteditor.IDocumentProvider;
 import org.eclipse.ui.texteditor.ITextEditorActionConstants;
 import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
 import org.eclipse.ui.texteditor.ResourceAction;
+import org.eclipse.ui.texteditor.SourceViewerDecorationSupport;
 import org.eclipse.ui.texteditor.TextEditorAction;
 import org.eclipse.ui.texteditor.TextOperationAction;
-import org.eclipse.ui.texteditor.SourceViewerDecorationSupport;
-import org.modelica.mdt.ui.text.ModelicaDocumentProvider;
-import org.eclipse.ui.texteditor.IDocumentProvider;
 import org.eclipse.ui.views.contentoutline.ContentOutline;
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.Viewer;
-
-import org.modelica.mdt.ui.PreferenceConstants;
-import org.modelica.mdt.ui.UIPlugin;
 import org.modelica.mdt.breakpoint.MDTBreakpointAdapter;
 import org.modelica.mdt.core.IModelicaElement;
@@ -125 +115 @@
 import org.modelica.mdt.internal.core.DefinitionSourceRegion;
 import org.modelica.mdt.internal.core.ErrorManager;
+import org.modelica.mdt.ui.PreferenceConstants;
+import org.modelica.mdt.ui.UIPlugin;
+import org.modelica.mdt.ui.actions.FoldingActionGroup;
+import org.modelica.mdt.ui.actions.IModelicaEditorActionDefinitionIds;
+import org.modelica.mdt.ui.actions.OpenAction;
+import org.modelica.mdt.ui.hover.ModelicaSourceHover;
+import org.modelica.mdt.ui.hover.SourceViewerInformationControl;
 import org.modelica.mdt.ui.text.IModelicaPartitions;
 import org.modelica.mdt.ui.text.ModelicaCodeResolver;
+import org.modelica.mdt.ui.text.ModelicaDocumentProvider;
 import org.modelica.mdt.ui.text.ModelicaFoldingStructureProvider;
 import org.modelica.mdt.ui.text.ModelicaPairMatcher;
@@ -175 +173 @@
 
     /* deals with opening the second file in the editor and notifying the outline page*/
+    @Override
     public void propertyChanged(Object obj, int prop)
     {
@@ -209 +208 @@
      * @see org.eclipse.ui.texteditor.AbstractTextEditor#rulerContextMenuAboutToShow(org.eclipse.jface.action.IMenuManager)
      */
+    @Override
     protected void rulerContextMenuAboutToShow(IMenuManager menu) {
         super.rulerContextMenuAboutToShow(menu);
@@ -231 +231 @@
     
     
+    @Override
     protected void initializeEditor() 
     {
@@ -246 +247 @@
     }   
     
+    @Override
     public IDocumentProvider getDocumentProvider()
     {
@@ -253 +255 @@
     }
     
+    @Override
     protected void createActions() 
     {
@@ -343 +346 @@
         fProjectionSupport.addSummarizableAnnotationType("org.eclipse.ui.workbench.texteditor.warning"); //$NON-NLS-1$
         fProjectionSupport.setHoverControlCreator(new IInformationControlCreator() {
+            @Override
             public IInformationControl createInformationControl(Shell shell) {
                 return new SourceViewerInformationControl(shell, SWT.TOOL | SWT.NO_TRIM | getOrientation(), SWT.NONE);
@@ -352 +356 @@
         fProjectionModelUpdater= new ModelicaFoldingStructureProvider();
         if (fProjectionModelUpdater != null)
-            fProjectionModelUpdater.install(this, (ProjectionViewer)projectionViewer);
+            fProjectionModelUpdater.install(this, projectionViewer);
 
         // ensure source fViewer decoration support has been created and configured
@@ -366 +370 @@
     }
     
+    @Override
     public void dispose()
     {
@@ -537 +542 @@
     
         
+    @Override
     protected void configureSourceViewerDecorationSupport(SourceViewerDecorationSupport support) 
     {   
@@ -550 +556 @@
 
     @Override
-    public Object getAdapter(Class adapter) 
+    public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) 
     {
         try
@@ -659 +665 @@
          * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
          */
+        @Override
         public void selectionChanged(SelectionChangedEvent event) {
             // XXX: see https://bugs.eclipse.org/bugs/show_bug.cgi?id=56161
@@ -680 +687 @@
      */
     class OutlineSelectionChangedListener  extends AbstractSelectionChangedListener {
+        @Override
         public void selectionChanged(SelectionChangedEvent event) {
             doSelectionChanged(event);
@@ -697 +705 @@
 
         ISelection selection= event.getSelection();
-        Iterator iter= ((IStructuredSelection) selection).iterator();
+        Iterator<?> iter= ((IStructuredSelection) selection).iterator();
         while (iter.hasNext()) {
             Object o= iter.next();
@@ -762 +770 @@
         {
             IModelicaElement me = ((ModelicaElementEditorInput)i).getSourceFile();
-            if (me != null) return (IModelicaElement)me;
+            if (me != null) return me;
         }
         return EditorUtility.getEditorInputModelicaElement(this);
@@ -938 +946 @@
      * @see AbstractTextEditor#adjustHighlightRange(int, int)
      */
+    @Override
     protected void adjustHighlightRange(int offset, int length) {
 
@@ -1020 +1029 @@
          * @see org.eclipse.jface.text.information.IInformationProvider#getSubject(org.eclipse.jface.text.ITextViewer, int)
          */
+        @Override
         public IRegion getSubject(ITextViewer textViewer, int invocationOffset) {
             return fHoverRegion;
@@ -1026 +1036 @@
          * @see org.eclipse.jface.text.information.IInformationProvider#getInformation(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
          */
+        @Override
         public String getInformation(ITextViewer textViewer, IRegion subject) {
             return fHoverInfo.toString();
@@ -1033 +1044 @@
          * @since 3.2
          */
+        @Override
         public Object getInformation2(ITextViewer textViewer, IRegion subject) {
             return fHoverInfo;
@@ -1039 +1051 @@
          * @see org.eclipse.jface.text.information.IInformationProviderExtension2#getInformationPresenterControlCreator()
          */
+        @Override
         public IInformationControlCreator getInformationPresenterControlCreator() {
             return fControlCreator;
@@ -1073 +1086 @@
          * @see org.eclipse.jface.action.IAction#run()
          */
+        @Override
         public void run() {
 
@@ -1173 +1187 @@
      * @see org.eclipse.ui.texteditor.AbstractDecoratedTextEditor#initializeKeyBindingScopes()
      */
+    @Override
     protected void initializeKeyBindingScopes() {
         setKeyBindingScopes(new String[] { "org.modelica.mdt.ui.modelicaEditorScope" });  //$NON-NLS-1$
@@ -1187 +1202 @@
      * @since 3.3
      */
+    @Override
     protected void handleCursorPositionChanged() {
         super.handleCursorPositionChanged();
@@ -1273 +1289 @@
          * @see org.eclipse.ui.IPartListener2#partVisible(org.eclipse.ui.IWorkbenchPartReference)
          */
+        @Override
         public void partVisible(IWorkbenchPartReference partRef) {
             if (ModelicaEditor.this.equals(partRef.getPart(false))) {
@@ -1283 +1300 @@
          * @see org.eclipse.ui.IPartListener2#partClosed(org.eclipse.ui.IWorkbenchPartReference)
          */
+        @Override
         public void partClosed(IWorkbenchPartReference partRef) {
             if (ModelicaEditor.this.equals(partRef.getPart(false))) {
@@ -1289 +1307 @@
         }
 
+        @Override
         public void partActivated(IWorkbenchPartReference partRef) {}
+        @Override
         public void partBroughtToTop(IWorkbenchPartReference partRef) {}
+        @Override
         public void partDeactivated(IWorkbenchPartReference partRef) {}
+        @Override
         public void partOpened(IWorkbenchPartReference partRef) {}
+        @Override
         public void partHidden(IWorkbenchPartReference partRef) {}
+        @Override
         public void partInputChanged(IWorkbenchPartReference partRef) {}
     }
@@ -1317 +1341 @@
     }
     
+    @Override
     protected void handlePreferenceStoreChanged(PropertyChangeEvent event) {
 
@@ -1384 +1409 @@
      * @see org.eclipse.ui.texteditor.AbstractTextEditor#performRevert()
      */
+    @Override
     protected void performRevert() {
         ProjectionViewer projectionViewer= (ProjectionViewer) getSourceViewer();
@@ -1409 +1435 @@
     }
 
+    @Override
     protected void installEncodingSupport() {
         fEncodingSupport= new DefaultEncodingSupport();
@@ -1417 +1444 @@
      * @see StatusTextEditor#getStatusHeader(IStatus)
      */
+    @Override
     protected String getStatusHeader(IStatus status) {
         if (fEncodingSupport != null) {
@@ -1429 +1457 @@
      * @see StatusTextEditor#getStatusBanner(IStatus)
      */
+    @Override
     protected String getStatusBanner(IStatus status) {
         if (fEncodingSupport != null) {
@@ -1441 +1470 @@
      * @see StatusTextEditor#getStatusMessage(IStatus)
      */
+    @Override
     protected String getStatusMessage(IStatus status) {
         if (fEncodingSupport != null) {