Author: timotei
Date: Thu Aug 4 21:13:41 2011
New Revision: 50598
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50598&view=rev
Log:
eclipse plugin: Use qualified class names so Eclipse
won't import those classes to trigger "unused import"
when compiling the plugin. Also move the syntax adapter
class to a better syntax
Added:
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/syntax/WMLSyntaxColoringAdapter.java
- copied, changed from r50597,
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/WMLSyntaxColoringAdapter.java
Removed:
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/WMLSyntaxColoringAdapter.java
Modified:
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/syntax/WMLCharacterPairMatcher.java
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/syntax/WMLSemanticHighlightingCalculator.java
trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/utils/ResourceUtils.java
Removed:
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/WMLSyntaxColoringAdapter.java
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/WMLSyntaxColoringAdapter.java?rev=50597&view=auto
==============================================================================
---
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/WMLSyntaxColoringAdapter.java
(original)
+++
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/WMLSyntaxColoringAdapter.java
(removed)
@@ -1,35 +1,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 by Timotei Dolean <[email protected]>
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
-
*******************************************************************************/
-package org.wesnoth.ui;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.wesnoth.ui.syntax.WMLHighlightingConfiguration;
-
-/**
- * A simple WML adapter that holds a coloring id on the specified resource
- */
-public class WMLSyntaxColoringAdapter extends AdapterImpl
-{
- /**
- * A color id from the {@link WMLHighlightingConfiguration}
- */
- public String ColorId;
-
- /**
- * The object to color
- */
- public EObject TargetEObject;
-
- public WMLSyntaxColoringAdapter( String id, EObject target)
- {
- ColorId = id;
- TargetEObject = target;
- }
-}
Modified:
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/syntax/WMLCharacterPairMatcher.java
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/syntax/WMLCharacterPairMatcher.java?rev=50598&r1=50597&r2=50598&view=diff
==============================================================================
---
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/syntax/WMLCharacterPairMatcher.java
(original)
+++
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/syntax/WMLCharacterPairMatcher.java
Thu Aug 4 21:13:41 2011
@@ -19,7 +19,6 @@
import org.eclipse.xtext.ui.editor.model.XtextDocument;
import org.eclipse.xtext.ui.editor.utils.EditorUtils;
import org.eclipse.xtext.util.concurrent.IUnitOfWork;
-import org.wesnoth.ui.WMLSyntaxColoringAdapter;
import org.wesnoth.ui.editor.WMLEditor;
import org.wesnoth.utils.WMLUtils;
import org.wesnoth.wml.WMLTag;
Modified:
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/syntax/WMLSemanticHighlightingCalculator.java
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/syntax/WMLSemanticHighlightingCalculator.java?rev=50598&r1=50597&r2=50598&view=diff
==============================================================================
---
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/syntax/WMLSemanticHighlightingCalculator.java
(original)
+++
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/syntax/WMLSemanticHighlightingCalculator.java
Thu Aug 4 21:13:41 2011
@@ -22,7 +22,6 @@
import org.eclipse.xtext.resource.XtextResource;
import org.eclipse.xtext.ui.editor.syntaxcoloring.IHighlightedPositionAcceptor;
import
org.eclipse.xtext.ui.editor.syntaxcoloring.ISemanticHighlightingCalculator;
-import org.wesnoth.ui.WMLSyntaxColoringAdapter;
import org.wesnoth.utils.Pair;
import org.wesnoth.wml.WMLKey;
import org.wesnoth.wml.WMLMacroCall;
Copied:
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/syntax/WMLSyntaxColoringAdapter.java
(from r50597,
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/WMLSyntaxColoringAdapter.java)
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/syntax/WMLSyntaxColoringAdapter.java?p2=trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/syntax/WMLSyntaxColoringAdapter.java&p1=trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/WMLSyntaxColoringAdapter.java&r1=50597&r2=50598&rev=50598&view=diff
==============================================================================
---
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/WMLSyntaxColoringAdapter.java
(original)
+++
trunk/utils/umc_dev/org.wesnoth.ui/src/org/wesnoth/ui/syntax/WMLSyntaxColoringAdapter.java
Thu Aug 4 21:13:41 2011
@@ -6,11 +6,10 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
-package org.wesnoth.ui;
+package org.wesnoth.ui.syntax;
import org.eclipse.emf.common.notify.impl.AdapterImpl;
import org.eclipse.emf.ecore.EObject;
-import org.wesnoth.ui.syntax.WMLHighlightingConfiguration;
/**
* A simple WML adapter that holds a coloring id on the specified resource
@@ -18,7 +17,7 @@
public class WMLSyntaxColoringAdapter extends AdapterImpl
{
/**
- * A color id from the {@link WMLHighlightingConfiguration}
+ * A color id from the {@link
org.wesnoth.ui.syntax.WMLHighlightingConfiguration}
*/
public String ColorId;
Modified:
trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/utils/ResourceUtils.java
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/utils/ResourceUtils.java?rev=50598&r1=50597&r2=50598&view=diff
==============================================================================
--- trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/utils/ResourceUtils.java
(original)
+++ trunk/utils/umc_dev/org.wesnoth/src/org/wesnoth/utils/ResourceUtils.java
Thu Aug 4 21:13:41 2011
@@ -33,7 +33,6 @@
import org.wesnoth.Messages;
import org.wesnoth.builder.DependencyListNode;
import org.wesnoth.preferences.Preferences.Paths;
-import org.wesnoth.projects.ProjectUtils;
import org.wesnoth.templates.ReplaceableParameter;
import org.wesnoth.templates.TemplateProvider;
import org.wesnoth.wml.SimpleWMLParser;
@@ -464,7 +463,7 @@
/**
* Gets the campaign id from the specified resource, or null
* If the resource is not a '_main.cfg' it will search for it
- * with {@link ProjectUtils#getMainConfigLocation(IResource)}
+ * with {@link
org.wesnoth.projects.ProjectUtils#getMainConfigLocation(IResource)}
* @param resource The resource where to search the id
* @return
*/
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
