Changeset 56 for java

Timestamp:

01/25/10 12:55:18 (15 years ago)

Author:

tmaciejewski

Message:

Framclipse updates:

• added information where parsing errors occured
• removed deprecated API from hover support

Location:

java/FramclipsePlugin

Files:

• META-INF/MANIFEST.MF (modified) (1 diff)
• src/main/java/com/framsticks/framclipse/editors/configuration/ErrorHandler.java (added)
• src/main/java/com/framsticks/framclipse/editors/configuration/FramclipseReconcilingStrategy.java (modified) (5 diffs)
• src/main/java/com/framsticks/framclipse/editors/hover/FramscriptTextHover.java (modified) (3 diffs)
• src/main/java/com/framsticks/framclipse/internal/parser/FramclipseParser.java (modified) (3 diffs)

java/FramclipsePlugin/META-INF/MANIFEST.MF

@@ -13 +13 @@
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.ui.views,
- org.eclipse.ui.ide
+ org.eclipse.ui.ide,
+ org.eclipse.core.resources
 Eclipse-LazyStart: true
 Export-Package: 

java/FramclipsePlugin/src/main/java/com/framsticks/framclipse/editors/configuration/FramclipseReconcilingStrategy.java

@@ -7 +7 @@
 import java.util.List;
 
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
@@ -22 +25 @@
 import org.eclipse.ui.IPathEditorInput;
 import org.eclipse.ui.IURIEditorInput;
+import org.eclipse.ui.ide.ResourceUtil;
 
 import com.framsticks.framclipse.editors.FramclipseEditor;
@@ -33 +37 @@
 import com.framsticks.framclipse.internal.parser.FramclipseParser;
 import com.framsticks.framclipse.internal.parser.Node;
+import com.framsticks.framclipse.internal.parser.ParseException;
+import com.framsticks.framclipse.internal.parser.TokenMgrError;
 
 
@@ -89 +95 @@
                                                 viewer.setRedraw(false);
                                                 
-                                                parseDocument();
+                                                IResource resource = ResourceUtil.getResource(fEditor.getEditorInput());
+                                                resource.deleteMarkers(IMarker.PROBLEM, true, IResource.DEPTH_ZERO);
+
+                                                try {
+                                                        parseDocument();
+                                                } catch (ParseException e) {
+                                                        ErrorHandler<ParseException> handler = new ErrorHandler.ParseErrorHandler();
+                                                        handler.createMarker(resource, e);
+                                                } catch (TokenMgrError e) {
+                                                        ErrorHandler<TokenMgrError> handler = new ErrorHandler.TokenErrorHandler();
+                                                        handler.createMarker(resource, e);
+                                                }
                                                 fEditor.updateOutlinePage();
                                                 
                                                 collectAndUpdateAnnotations();
+                                        } catch (CoreException e) {
+                                                e.printStackTrace();
                                         }
                                         finally
@@ -105 +124 @@
         }
         
-        void parseDocument()
+        void parseDocument() throws ParseException
         {
                 

java/FramclipsePlugin/src/main/java/com/framsticks/framclipse/editors/hover/FramscriptTextHover.java

@@ -5 +5 @@
 import org.eclipse.jface.internal.text.html.BrowserInformationControl;
 import org.eclipse.jface.internal.text.html.HTMLTextPresenter;
+import org.eclipse.jface.resource.JFaceResources;
 import org.eclipse.jface.text.AbstractReusableInformationControlCreator;
 import org.eclipse.jface.text.BadLocationException;
@@ -35 +36 @@
 
                 public IInformationControl doCreateInformationControl(Shell parent) {
-                        int shellStyle= SWT.RESIZE | SWT.TOOL;
-                        int style= SWT.V_SCROLL | SWT.H_SCROLL;
-                        if (BrowserInformationControl.isAvailable(parent))
-                                return new BrowserInformationControl(parent, shellStyle, style);
-                        else
-                                return new DefaultInformationControl(parent, shellStyle, style, new HTMLTextPresenter(false));
+//                      int shellStyle= SWT.RESIZE | SWT.TOOL;
+//                      int style= SWT.V_SCROLL | SWT.H_SCROLL;
+//                      if (BrowserInformationControl.isAvailable(parent)) {
+//                              return new BrowserInformationControl(parent, JFaceResources.DIALOG_FONT, true);
+//                              return new BrowserInformationControl(parent, shellStyle, style);
+//                      } else
+//                              return new DefaultInformationControl(parent, shellStyle, style, new HTMLTextPresenter(false));
+                                return new DefaultInformationControl(parent, true);
                 }
         }
@@ -47 +50 @@
                 
                 public IInformationControl doCreateInformationControl(Shell parent) {
-                        if (BrowserInformationControl.isAvailable(parent))
-                                return new BrowserInformationControl(parent, SWT.TOOL | SWT.NO_TRIM, SWT.NONE, EditorsUI.getTooltipAffordanceString());
-                        else
-                                return new DefaultInformationControl(parent, SWT.NONE, new HTMLTextPresenter(true), EditorsUI.getTooltipAffordanceString());
+//                      if (BrowserInformationControl.isAvailable(parent)) {
+//                              return new BrowserInformationControl(parent, JFaceResources.DIALOG_FONT, true);
+//                              return new BrowserInformationControl(parent, SWT.TOOL | SWT.NO_TRIM, SWT.NONE, EditorsUI.getTooltipAffordanceString());
+//                      } else {
+//                              return new DefaultInformationControl(parent, SWT.NONE, new HTMLTextPresenter(true), EditorsUI.getTooltipAffordanceString());
+                                return new DefaultInformationControl(parent, true);
+//                      }
                 }
 

java/FramclipsePlugin/src/main/java/com/framsticks/framclipse/internal/parser/FramclipseParser.java

@@ -26 +26 @@
         }
         
-        public Node parse(String content, EditorType editorType, URL url) {
+        public Node parse(String content, EditorType editorType, URL url) throws ParseException {
                 if (editorType.equals(EditorType.FRAMSCRIPT)) {
 
@@ -66 +66 @@
                                                                 } 
                                                                 recursiveSetOffset(inc, inc.getBeginOffset(), inc.getEndOffset());
-                                                        } catch (Throwable e) {
+                                                        } catch (ParseException e) {
                                                                 inc.setValid(false); 
                                                                 System.err.println("In "+path+fname);
@@ -75 +75 @@
                                 }
                                 return model;
+                        } catch (ParseException e) {
+                                e.printStackTrace();
+                                throw e;
+                        } catch (TokenMgrError e) {
+                                e.printStackTrace();
+                                throw e;
                         } catch (Exception e) {
                                 e.printStackTrace();
-                        } catch (TokenMgrError err) {
-                                err.printStackTrace();
                         }
                 }