Changeset 437


Ignore:
Timestamp:
Jun 17, 2010 5:02:10 PM (14 years ago)
Author:
Anya Helene Bagge
Message:
  • Convert source to 1.5 style (no @Override for interface-specified methods)
  • Bump version and release
Files:
2 added
2 deleted
20 edited

Legend:

Unmodified
Added
Removed

  • magnolia-feature/feature.xml

    r435 r437  
    33      id="magnolia_feature"
    44      label="Magnolia_feature"
    5       version="0.1.6">
     5      version="0.1.7">
    66
    77   <description url="http://magnolia-lang.org/">

  • magnolia-update-site/site.xml

    r436 r437  
    44      Update site for Magnolia plugin
    55   </description>
    6    <feature url="features/magnolia_feature_0.1.6.jar" id="magnolia_feature" version="0.1.6">
     6   <feature url="features/magnolia_feature_0.1.7.jar" id="magnolia_feature" version="0.1.7">
    77      <category name="Magnolia"/>
    88   </feature>

  • trunk/MagnoliaPlugin/.settings/org.eclipse.jdt.core.prefs

    r433 r437  
    1 #Thu Jun 17 16:37:31 CEST 2010
     1#Thu Jun 17 16:46:40 CEST 2010
    22eclipse.preferences.version=1
    33org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
    4 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
     4org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
    55org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
    6 org.eclipse.jdt.core.compiler.compliance=1.6
     6org.eclipse.jdt.core.compiler.compliance=1.5
    77org.eclipse.jdt.core.compiler.debug.lineNumber=generate
    88org.eclipse.jdt.core.compiler.debug.localVariable=generate
    … …  
    1010org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
    1111org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
    12 org.eclipse.jdt.core.compiler.source=1.6
     12org.eclipse.jdt.core.compiler.source=1.5

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

    r434 r437  
    33Bundle-Name: magnolia-eclipse
    44Bundle-SymbolicName: magnolia_eclipse;singleton:=true
    5 Bundle-Version: 0.1.6.qualifier
     5Bundle-Version: 0.1.7.qualifier
    66Bundle-Activator: org.magnolialang.eclipse.MagnoliaPlugin
    77Bundle-ActivationPolicy: lazy

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

    r404 r437  
    77
    88public class RefreshRascal extends AbstractHandler {
    9         @Override
    109        public Object execute(ExecutionEvent event) throws ExecutionException {
    1110                RascalInterpreter.getInstance().refresh();

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

    r417 r437  
    3030
    3131public class SelectConstruct extends AbstractHandler {
    32         @Override
    3332        public Object execute(ExecutionEvent event) throws ExecutionException {
    3433                IEditorPart editorPart = HandlerUtil.getActiveEditor(event);

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

    r428 r437  
    3030public class ViewFlattenedModule extends AbstractHandler {
    3131        @SuppressWarnings("deprecation")
    32         @Override
    3332        public Object execute(ExecutionEvent event) throws ExecutionException {
    3433                IEditorPart editorPart = HandlerUtil.getActiveEditor(event);

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

    r428 r437  
    2828        }
    2929
    30         @Override
    3130        public void addPath(URI src, URI bin) {
    3231                src = addSlash(src);
    … …  
    3837        }
    3938
    40         @Override
    4139        public void addPath(URI src) {
    4240                src = addSlash(src);
    … …  
    5755
    5856
    59         @Override
    6057        public URI find(String moduleName) {
    6158                String[] components = moduleName.split("\\.");
    … …  
    103100        }
    104101
    105         @Override
    106102        public URI getBinPath(URI src) {
    107103                if (pathMap.containsKey(src))
    … …  
    113109        }
    114110
    115         @Override
    116111        public URI getMainBinPath() {
    117112                return mainBinPath;
    118113        }
    119114
    120         @Override
    121115        public IBuildPath newPath(URI mainBinPath) {
    122116                return new MagnoliaBuildPath(mainBinPath);
    123117        }
    124118
    125         @Override
    126119        public IBuildPath newPath() {
    127120                return new MagnoliaBuildPath(mainBinPath);
    128121        }
    129122
    130         @Override
    131123        public void setMainBinPath(URI bin) {
    132124                mainBinPath = bin;
    133125        }
    134126
    135         @Override
    136127        public Pair<URI, String> getModuleName(URI uri) {
    137128                uri = uri.normalize();

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

    r428 r437  
    9292        }
    9393
    94         @Override
    9594        public long lastModified(URI uri) {
    9695                try {

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

    r428 r437  
    7070        }
    7171
    72         @Override
    7372        public void createModule(String moduleName, IConstructor moduleTree) {
    7473
    … …  
    7675
    7776        @SuppressWarnings("deprecation")
    78         @Override
    7977        public void createModule(String moduleName, String sourceModuleName, IConstructor moduleTree) {
    8078                ModuleInfo srcInfo = getModuleInfo(sourceModuleName);
    … …  
    110108        }
    111109
    112         @Override
    113110        public MagnoliaEnvironment getModuleEnv(String moduleName) {
    114111                if(moduleMap.containsKey(moduleName)) {
    … …  
    134131        }
    135132
    136         @Override
    137133        public IConstructor getModuleTree(String moduleName) {
    138134                return getModuleTree(moduleName, false);
    … …  
    143139        }
    144140       
    145         @Override
    146141        public IConstructor getModuleTree(String moduleName, boolean loadFromEditor)  {
    147142                ModuleInfo info = getModuleInfo(moduleName);

  • trunk/MagnoliaPlugin/src/org/magnolialang/parsetree/SortNameMatcher.java

    r405 r437  
    1515                Collections.addAll(this.sort, sort);
    1616        }
    17         @Override
    1817        public boolean match(IConstructor tree) {
    1918                return TreeAdapter.hasSortName(tree) && sort.contains(TreeAdapter.getSortName(tree));

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

    r426 r437  
    1515        }
    1616
    17         @Override
    1817        public long lastModified(URI uri) {
    1918                return getAbsolutePath(uri).lastModified();

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

    r426 r437  
    1414        }
    1515
    16         @Override
    1716        public long lastModified(URI uri) {
    1817                try {

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

    r426 r437  
    1010        }
    1111
    12         @Override
    1312        public long lastModified(URI uri) {
    1413                return new File(uri.getPath()).lastModified();

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

    r426 r437  
    66public class HttpURIResolver extends org.rascalmpl.uri.HttpURIResolver implements IURIInputStreamResolver {
    77
    8         @Override
    98        public long lastModified(URI uri) {
    109                try {

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

    r426 r437  
    1212         * @return An indication of when the URI was last changed, or 0 if unknown.
    1313         */
    14         public long lastModified(URI uri);
     14        public abstract long lastModified(URI uri);
    1515}

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

    r426 r437  
    55public class StandardInputURIResolver extends org.rascalmpl.uri.StandardInputURIResolver implements IURIInputStreamResolver {
    66
    7         @Override
    87        public long lastModified(URI uri) {
    98                return 0;
Note: See TracChangeset for help on using the changeset viewer.