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

Timestamp:

03/22/12 00:38:56 (13 years ago)

Author:

masberg

Message:

A few more formatting fixes and minor refactorings.

File:

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

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

@@ -487 +487 @@
         @Override
         public void selectionChanged(SelectionChangedEvent event) {
-            // XXX: see https://bugs.eclipse.org/bugs/show_bug.cgi?id=56161
             ModelicaEditor.this.selectionChanged();
         }
@@ -557 +556 @@
         return part != null && part.equals(this);
     }
+
     private boolean isModelicaContentOutlinePageActive() {
         IWorkbenchPart part= getActivePart();
@@ -757 +757 @@
                     markInNavigationHistory();
                 }
-
-            }
-            catch (Exception x) {
-            }
-
+            }
+            catch (Exception e) {
+                // Empty.
+            }
         }
         else if (moveCursor) {
@@ -800 +799 @@
                 IRegion range= getRegionFromSourceRegion(element.getLocation().getSourceRegion(), getViewer().getDocument());
                 if (offset < range.getOffset() + range.getLength() && range.getOffset() < offset + length) {
-
                     ISourceViewer viewer= getSourceViewer();
+
                     if (viewer instanceof ITextViewerExtension5) {
                         ITextViewerExtension5 extension= (ITextViewerExtension5) viewer;
@@ -808 +807 @@
 
                     setHighlightRange(range.getOffset(), range.getLength(), true);
+
                     if (fOutlinePage != null) {
                         fOutlineSelectionChangedListener.uninstall(fOutlinePage);
@@ -816 +816 @@
                     return;
                 }
+
                 element= element.getParent();
             }
-
         }
         catch (Exception x) {
@@ -889 +889 @@
             return fHoverInfo.toString();
         }
+
         /*
          * @see org.eclipse.jface.text.information.IInformationProviderExtension#getInformation2(org.eclipse.jface.text.ITextViewer, org.eclipse.jface.text.IRegion)
@@ -1098 +1099 @@
             if (sourceViewer instanceof ProjectionViewer) {
                 ProjectionViewer pv= (ProjectionViewer) sourceViewer;
-                if (pv.canDoOperation(ProjectionViewer.TOGGLE))
+                if (pv.canDoOperation(ProjectionViewer.TOGGLE)) {
                     pv.doOperation(ProjectionViewer.TOGGLE);
+                }
             }
         }
@@ -1237 +1239 @@
                     }
                 }
+
                 return;
             }
@@ -1243 +1246 @@
                     new ToggleFoldingRunner().runWhenNextVisible();
                 }
+
                 return;
             }
-
         }
         finally {
@@ -1282 +1285 @@
             if (projectionMode) {
                 projectionViewer.disableProjection();
-                if (fProjectionModelUpdater != null)
+                if (fProjectionModelUpdater != null) {
                     fProjectionModelUpdater.uninstall();
+                }
             }
 
@@ -1295 +1299 @@
                 projectionViewer.enableProjection();
             }
-
         }
         finally {
@@ -1313 +1316 @@
     @Override
     protected String getStatusHeader(IStatus status) {
+        String statusHeader = null;
+
         if (fEncodingSupport != null) {
-            String message= fEncodingSupport.getStatusHeader(status);
-            if (message != null) {
-                return message;
-            }
-        }
-
-        return super.getStatusHeader(status);
+            statusHeader = fEncodingSupport.getStatusHeader(status);
+        }
+
+        if (statusHeader == null) {
+            statusHeader = super.getStatusHeader(status);
+        }
+
+        return statusHeader;
     }
 
@@ -1328 +1334 @@
     @Override
     protected String getStatusBanner(IStatus status) {
+        String statusBanner = null;
+
         if (fEncodingSupport != null) {
-            String message= fEncodingSupport.getStatusBanner(status);
-            if (message != null) {
-                return message;
-            }
-        }
-
-        return super.getStatusBanner(status);
+            statusBanner = fEncodingSupport.getStatusBanner(status);
+        }
+
+        if (statusBanner == null) {
+            statusBanner = super.getStatusBanner(status);
+        }
+
+        return statusBanner;
     }
 
@@ -1343 +1352 @@
     @Override
     protected String getStatusMessage(IStatus status) {
+        String statusMessage = null;
+
         if (fEncodingSupport != null) {
-            String message= fEncodingSupport.getStatusMessage(status);
-            if (message != null) {
-                return message;
-            }
-        }
-
-        return super.getStatusMessage(status);
+            statusMessage = fEncodingSupport.getStatusMessage(status);
+        }
+
+        if (statusMessage == null) {
+            statusMessage = super.getStatusMessage(status);
+        }
+
+        return statusMessage;
     }
 }