Changeset 442


Ignore:
Timestamp:
Jun 21, 2010 9:15:35 PM (14 years ago)
Author:
Anya Helene Bagge
Message:

fix lots of warnings

Location:
trunk/MagnoliaPlugin
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/MagnoliaPlugin/META-INF/MANIFEST.MF

    r438 r442  
    2626 lpg.runtime
    2727Import-Package: org.junit
     28Bundle-RequiredExecutionEnvironment: JavaSE-1.6

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/commands/LaunchRascalConsole.java

    r401 r442  
    44import org.eclipse.core.commands.ExecutionEvent;
    55import org.eclipse.core.commands.ExecutionException;
    6 //import org.rascalmpl.eclipse.console.ConsoleFactory;
    7 import org.eclipse.ui.handlers.HandlerUtil;
    86
    97public class LaunchRascalConsole extends AbstractHandler{

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/commands/SelectConstruct.java

    r439 r442  
    77import org.eclipse.core.commands.ExecutionEvent;
    88import org.eclipse.core.commands.ExecutionException;
    9 import org.eclipse.imp.editor.UniversalEditor;
    109import org.eclipse.imp.pdb.facts.IConstructor;
    1110import org.eclipse.imp.pdb.facts.IMap;
    1211import org.eclipse.imp.pdb.facts.ISourceLocation;
    13 import org.eclipse.imp.pdb.facts.IString;
    1412import org.eclipse.imp.pdb.facts.IValue;
    15 import org.eclipse.imp.pdb.facts.visitors.VisitorException;
    1613import org.eclipse.swt.graphics.Point;
    1714import org.eclipse.ui.IEditorPart;
    … …  
    2219import org.magnolialang.eclipse.rascal.RascalInterpreter;
    2320import org.magnolialang.xatree.SortNameMatcher;
    24 import org.magnolialang.xatree.TreeImplodeVisitor;
    2521import org.magnolialang.xatree.TreeImploder;
    2622import org.magnolialang.xatree.XaTreeAdapter;

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/commands/ViewFlattenedModule.java

    r437 r442  
    11package org.magnolialang.eclipse.commands;
    22
    3 import java.io.IOException;
    4 import java.io.StringBufferInputStream;
    53import java.net.URI;
    64
    … …  
    86import org.eclipse.core.commands.ExecutionEvent;
    97import org.eclipse.core.commands.ExecutionException;
    10 import org.eclipse.core.resources.IFile;
    11 import org.eclipse.core.runtime.CoreException;
    12 import org.eclipse.core.runtime.IPath;
    138import org.eclipse.imp.editor.UniversalEditor;
    14 import org.eclipse.imp.model.ISourceProject;
    159import org.eclipse.imp.parser.IParseController;
    1610import org.eclipse.imp.pdb.facts.IConstructor;
    1711import org.eclipse.imp.pdb.facts.IList;
    1812import org.eclipse.imp.pdb.facts.IValue;
    19 import org.eclipse.imp.pdb.facts.IString;
    20 import org.eclipse.jface.dialogs.MessageDialog;
    2113import org.eclipse.ui.IEditorPart;
    2214import org.eclipse.ui.handlers.HandlerUtil;
    … …  
    2618import org.magnolialang.errors.CompilationError;
    2719import org.magnolialang.load.ProjectURIResolver;
    28 import org.magnolialang.load.ModuleLoader;
    2920import org.magnolialang.manager.MagnoliaProjectManager;
     21
    3022public class ViewFlattenedModule extends AbstractHandler {
    31         @SuppressWarnings("deprecation")
    3223        public Object execute(ExecutionEvent event) throws ExecutionException {
    3324                IEditorPart editorPart = HandlerUtil.getActiveEditor(event);

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/editor/ActionContributor.java

    r429 r442  
    33import org.eclipse.imp.editor.UniversalEditor;
    44import org.eclipse.imp.services.ILanguageActionsContributor;
    5 import org.eclipse.jface.action.Action;
    6 import org.eclipse.jface.action.IAction;
    75import org.eclipse.jface.action.IMenuManager;
    86import org.eclipse.jface.action.IStatusLineManager;
    97import org.eclipse.jface.action.IToolBarManager;
    10 import org.rascalmpl.checker.StaticChecker;
    118
    129public class ActionContributor implements ILanguageActionsContributor {
    1310
    14         private class EnableTypeCheckerMenuItem extends Action {
    1511
    16                 public EnableTypeCheckerMenuItem(String text) {
    17                         super(text, IAction.AS_CHECK_BOX);
    18                         if (StaticChecker.getInstance().isPassEnabled(StaticChecker.TYPECHECKER))
    19                                 this.setChecked(true);
    20                         else
    21                                 this.setChecked(false);
    22                 }
    23 
    24                 @Override
    25                 public void run() {
    26                         if (StaticChecker.getInstance().isPassEnabled(StaticChecker.TYPECHECKER)) {
    27                                 StaticChecker.getInstance().disablePipelinePass(StaticChecker.TYPECHECKER);
    28                                 this.setChecked(false);
    29                         } else {
    30                                 StaticChecker.getInstance().enablePipelinePass(StaticChecker.TYPECHECKER);
    31                                 this.setChecked(true);
    32                         }
    33                 }
     12        public void contributeToEditorMenu(UniversalEditor editor, IMenuManager menuManager) {
    3413        }
    35        
    36         public void contributeToEditorMenu(UniversalEditor editor, IMenuManager menuManager) {
    37 /*              menuManager.add(new Action("Load Checker") {
    38                         @Override
    39                         public void run() {
    40                                 StaticChecker.getInstance().reload();
    41                         }
    42                 });
    43 
    44                 menuManager.add(new EnableTypeCheckerMenuItem("Enable Checker"));
    45 */      }
    4614
    4715        public void contributeToMenuBar(final UniversalEditor editor, IMenuManager menu) {

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/editor/NodeLocator.java

    r439 r442  
    11package org.magnolialang.eclipse.editor;
    2 
    3 import java.util.Iterator;
    42
    53import org.eclipse.core.runtime.IPath;
    … …  
    1210import org.magnolialang.xatree.INodePredicate;
    1311import org.rascalmpl.ast.AbstractAST;
    14 //import org.rascalmpl.eclipse.outline.TreeModelBuilder.Group;
    1512import org.rascalmpl.values.uptr.Factory;
    1613import org.rascalmpl.values.uptr.ParsetreeAdapter;

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/editor/ParseController.java

    r428 r442  
    1212import org.eclipse.imp.parser.IMessageHandler;
    1313import org.eclipse.imp.parser.IParseController;
    14 import org.eclipse.imp.parser.ISourcePositionLocator;
    1514import org.eclipse.imp.pdb.facts.IConstructor;
    1615import org.eclipse.imp.pdb.facts.ISourceLocation;
    … …  
    2322import org.magnolialang.load.ModuleLoader;
    2423import org.magnolialang.load.ProjectURIResolver;
    25 import org.magnolialang.manager.IProjectManager;
    2624import org.magnolialang.manager.MagnoliaProjectManager;
    27 import org.rascalmpl.interpreter.env.ModuleEnvironment;
    2825import org.rascalmpl.interpreter.staticErrors.SyntaxError;
    2926import org.rascalmpl.values.errors.SummaryAdapter;

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/preferences/MagnoliaInstanceTab.java

    r369 r442  
    33import java.util.List;
    44import java.util.ArrayList;
    5 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
    6 import org.eclipse.core.runtime.preferences.IEclipsePreferences;
    75import org.eclipse.swt.widgets.Composite;
    86import org.eclipse.swt.widgets.Link;
    97import org.eclipse.imp.preferences.*;
    108import org.eclipse.imp.preferences.fields.*;
    11 import org.osgi.service.prefs.Preferences;
    12 
    139
    1410/**

  • trunk/MagnoliaPlugin/src/org/magnolialang/eclipse/preferences/MagnoliaProjectTab.java

    r369 r442  
    33import java.util.List;
    44import java.util.ArrayList;
    5 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
    65import org.eclipse.core.runtime.preferences.IEclipsePreferences;
    76import org.eclipse.swt.widgets.Composite;

  • trunk/MagnoliaPlugin/src/org/magnolialang/errors/ModuleNotFoundError.java

    r428 r442  
    3737                        return errorType;
    3838        }
     39       
     40        public String getModuleName() {
     41                return moduleName;
     42        }
    3943}

  • trunk/MagnoliaPlugin/src/org/magnolialang/load/ProjectURIResolver.java

    r437 r442  
    55import java.io.InputStream;
    66import java.io.OutputStream;
    7 import java.io.UnsupportedEncodingException;
    87import java.net.MalformedURLException;
    98import java.net.URI;
    109import java.net.URISyntaxException;
    11 import java.net.URLEncoder;
    1210
    1311import org.eclipse.core.resources.IFile;
    … …  
    1614import org.eclipse.core.runtime.CoreException;
    1715import org.eclipse.core.runtime.IPath;
    18 import org.eclipse.core.runtime.Path;
    1916import org.eclipse.imp.model.ISourceProject;
    20 import org.magnolialang.eclipse.MagnoliaPlugin;
    2117import org.magnolialang.uri.IURIInputStreamResolver;
    2218import org.magnolialang.uri.IURIOutputStreamResolver;

  • trunk/MagnoliaPlugin/src/org/magnolialang/manager/MagnoliaProjectManager.java

    r441 r442  
    33import java.io.IOException;
    44import java.io.StringBufferInputStream;
    5 import java.net.MalformedURLException;
    65import java.net.URI;
    76import java.util.HashMap;
    … …  
    1312import org.eclipse.core.resources.IResource;
    1413import org.eclipse.core.runtime.CoreException;
    15 import org.eclipse.core.runtime.IPath;
    1614import org.eclipse.core.runtime.Path;
    1715import org.eclipse.imp.model.ISourceProject;
    1816import org.eclipse.imp.pdb.facts.IConstructor;
    1917import org.eclipse.imp.pdb.facts.ISourceLocation;
    20 import org.eclipse.imp.pdb.facts.IString;
    21 import org.eclipse.imp.pdb.facts.IValue;
    2218import org.eclipse.imp.utils.Pair;
    2319import org.magnolialang.eclipse.MagnoliaPlugin;
    2420import org.magnolialang.eclipse.editor.ImplementationError;
    2521import org.magnolialang.eclipse.editor.ParseController;
    26 import org.magnolialang.eclipse.rascal.RascalInterpreter;
    2722import org.magnolialang.env.MagnoliaEnvironment;
    2823import org.magnolialang.errors.CompilationError;
    … …  
    3833import org.rascalmpl.values.uptr.ParsetreeAdapter;
    3934
     35@SuppressWarnings("deprecation")
    4036public class MagnoliaProjectManager implements IProjectManager {
    4137        private static Map<String, MagnoliaProjectManager> managerMap;
    … …  
    7571        }
    7672
    77         @SuppressWarnings("deprecation")
    7873        public void createModule(String moduleName, String sourceModuleName, IConstructor moduleTree) {
    7974                ModuleInfo srcInfo = getModuleInfo(sourceModuleName);
    … …  
    262257                if(loc != null) {
    263258                        URI uri = loc.getURI();
    264                         String name = uriMap.get(uri);
    265                         if(name != null) {
    266                                 ModuleInfo info = moduleMap.get(name);
    267                         }
     259
    268260                        IFile file = ProjectURIResolver.getFile(uri);
    269261                        try {

  • trunk/MagnoliaPlugin/src/org/magnolialang/programs/MagnoliaAdapter.java

    r439 r442  
    55
    66import org.eclipse.imp.pdb.facts.*;
    7 import org.eclipse.imp.pdb.facts.type.TypeFactory;
     7
    88import org.magnolialang.eclipse.rascal.RascalInterpreter;
    99import org.rascalmpl.values.ValueFactoryFactory;
    1010
    1111public class MagnoliaAdapter {
    12         private static TypeFactory tf = TypeFactory.getInstance();
     12
    1313        private static IValueFactory vf = ValueFactoryFactory.getValueFactory();
    1414        private static RascalInterpreter eval = RascalInterpreter.getInstance();

  • trunk/MagnoliaPlugin/src/org/magnolialang/uri/IURIInputStreamResolver.java

    r437 r442  
    11package org.magnolialang.uri;
    22
    3 import java.io.IOException;
    4 import java.io.InputStream;
    53import java.net.URI;
    64

  • trunk/MagnoliaPlugin/src/org/magnolialang/uri/IURIOutputStreamResolver.java

    r426 r442  
    11package org.magnolialang.uri;
    22
    3 import java.io.IOException;
    4 import java.io.OutputStream;
    5 import java.net.URI;
    63
    74public interface IURIOutputStreamResolver extends org.rascalmpl.uri.IURIOutputStreamResolver {

  • trunk/MagnoliaPlugin/src/org/magnolialang/xatree/CxxSkin.java

    r439 r442  
    11package org.magnolialang.xatree;
     2
     3import static org.magnolialang.xatree.XaTreeFactory.child;
     4import static org.magnolialang.xatree.XaTreeFactory.space;
     5import static org.magnolialang.xatree.XaTreeFactory.token;
    26
    37import org.eclipse.imp.pdb.facts.IConstructor;
    … …  
    610import org.eclipse.imp.pdb.facts.IValue;
    711import org.eclipse.imp.pdb.facts.IValueFactory;
    8 import org.eclipse.imp.pdb.facts.type.TypeFactory;
    912import org.rascalmpl.values.ValueFactoryFactory;
    10 import static org.magnolialang.xatree.XaTreeFactory.*;
    1113
    1214public class CxxSkin implements ILanguageSkin {
    13         private static TypeFactory tf = TypeFactory.getInstance();
    1415        private static IValueFactory vf = ValueFactoryFactory.getValueFactory();
    1516        private static final IString CONS_IF = vf.string("If");
    16         private static final IString CONS_VAR = vf.string("Var");
     17        //private static final IString CONS_VAR = vf.string("Var");
    1718        private static final IString SORT_EXPR = vf.string("Expr");
    1819        public IList getConcrete(IString cons, IString sort, IValue context) {

  • trunk/MagnoliaPlugin/src/org/magnolialang/xatree/TestXaTree.java

    r439 r442  
    44
    55import java.util.Random;
    6 
    7 import org.eclipse.imp.pdb.facts.IConstructor;
    8 import org.eclipse.imp.pdb.facts.IMap;
    9 import org.eclipse.imp.pdb.facts.ITuple;
    10 import org.eclipse.imp.pdb.facts.IValue;
     6import org.eclipse.imp.pdb.facts.*;
    117import org.junit.Test;
    128

  • trunk/MagnoliaPlugin/src/org/magnolialang/xatree/TreeImplodeVisitor.java

    r440 r442  
    1919import org.rascalmpl.values.ValueFactoryFactory;
    2020import org.rascalmpl.values.uptr.Factory;
    21 import org.rascalmpl.values.uptr.ParsetreeAdapter;
    2221import org.rascalmpl.values.uptr.ProductionAdapter;
    2322import org.rascalmpl.values.uptr.SymbolAdapter;

  • trunk/MagnoliaPlugin/src/org/magnolialang/xatree/XaTreeAdapter.java

    r439 r442  
    11package org.magnolialang.xatree;
    22
    3 import java.util.ArrayList;
    4 import java.util.LinkedList;
    5 import java.util.List;
    6 
    7 import org.eclipse.imp.pdb.facts.*;
     3import static org.magnolialang.xatree.XaTreeFactory.*;
     4import org.eclipse.imp.pdb.facts.IConstructor;
     5import org.eclipse.imp.pdb.facts.IInteger;
     6import org.eclipse.imp.pdb.facts.IList;
     7import org.eclipse.imp.pdb.facts.IListWriter;
     8import org.eclipse.imp.pdb.facts.IMap;
     9import org.eclipse.imp.pdb.facts.IString;
     10import org.eclipse.imp.pdb.facts.IValue;
     11import org.eclipse.imp.pdb.facts.IValueFactory;
    812import org.eclipse.imp.pdb.facts.type.Type;
    9 import org.eclipse.imp.pdb.facts.type.TypeFactory;
    10 import org.eclipse.imp.pdb.facts.type.TypeStore;
    11 import org.eclipse.imp.pdb.facts.visitors.BottomUpVisitor;
    12 import org.eclipse.imp.pdb.facts.visitors.IValueVisitor;
    1313import org.eclipse.imp.pdb.facts.visitors.IdentityVisitor;
    1414import org.eclipse.imp.pdb.facts.visitors.NullVisitor;
    … …  
    1616import org.magnolialang.eclipse.editor.ImplementationError;
    1717import org.rascalmpl.values.ValueFactoryFactory;
    18 import org.rascalmpl.values.uptr.visitors.TreeVisitor;
    19 
    20 import static org.magnolialang.xatree.XaTreeFactory.*;
     18
    2119public class XaTreeAdapter {
    22         public static TypeStore ts = new TypeStore(
    23                         org.rascalmpl.values.uptr.Factory.getStore(),
    24                         org.rascalmpl.values.errors.Factory.getStore(),
    25                         org.rascalmpl.values.locations.Factory.getStore());
    26         private static TypeFactory tf = TypeFactory.getInstance();
    2720        private static IValueFactory vf = ValueFactoryFactory.getValueFactory();
    2821
    … …  
    243236                try {
    244237                        return tree.accept(new NullVisitor<String>() {
    245                                 private List<String> indentStack = new LinkedList<String>();
    246                                 private List<IValue> contextStack = new LinkedList<IValue>();
     238                        //      private List<String> indentStack = new LinkedList<String>();
     239                        //      private List<IValue> contextStack = new LinkedList<IValue>();
    247240                               
    248241                                public String visitConstructor(IConstructor c) throws VisitorException {

  • trunk/MagnoliaPlugin/src/org/magnolialang/xatree/XaTreeFactory.java

    r439 r442  
    2020        private static final int RANDOM_CHANCE_CONS = 35;
    2121        private static final int RANDOM_CHANCE_SEQ = 45;
    22         private static final int RANDOM_CHANCE_LEAF = 100;
    2322        private static final int RANDOM_MAX_CHILDREN = 5;
    2423        public static TypeStore ts = new TypeStore(
Note: See TracChangeset for help on using the changeset viewer.