eclipse plugin: Move the .wml.core classes into .wml...

...and remove the debug information
This commit is contained in:
Timotei Dolean 2011-07-26 15:37:48 +00:00
parent 1ddd06cec0
commit 725c406f6c
8 changed files with 13 additions and 23 deletions

View file

@ -36,12 +36,12 @@ import org.wesnoth.ui.labeling.WMLLabelProvider;
import org.wesnoth.utils.ResourceUtils;
import org.wesnoth.utils.StringUtils;
import org.wesnoth.utils.WMLUtils;
import org.wesnoth.wml.WMLConfig;
import org.wesnoth.wml.WMLKey;
import org.wesnoth.wml.WMLKeyValue;
import org.wesnoth.wml.WMLTag;
import org.wesnoth.wml.core.WMLConfig;
import org.wesnoth.wml.core.WMLVariable;
import org.wesnoth.wml.core.WMLVariable.Scope;
import org.wesnoth.wml.WMLVariable;
import org.wesnoth.wml.WMLVariable.Scope;
import com.google.common.base.Function;
import com.google.common.base.Predicates;

View file

@ -41,8 +41,8 @@ import org.wesnoth.utils.ResourceUtils;
import org.wesnoth.utils.StringUtils;
import org.wesnoth.utils.WMLTools;
import org.wesnoth.utils.WorkspaceUtils;
import org.wesnoth.wml.core.SimpleWMLParser;
import org.wesnoth.wml.core.WMLConfig;
import org.wesnoth.wml.SimpleWMLParser;
import org.wesnoth.wml.WMLConfig;
/**
* The builder does the following steps in order to create and ensure

View file

@ -29,8 +29,8 @@ import org.wesnoth.preferences.Preferences;
import org.wesnoth.preprocessor.Define;
import org.wesnoth.preprocessor.PreprocessorUtils;
import org.wesnoth.utils.ResourceUtils;
import org.wesnoth.wml.core.WMLConfig;
import org.wesnoth.wml.core.WMLVariable;
import org.wesnoth.wml.WMLConfig;
import org.wesnoth.wml.WMLVariable;
/**
* A class that stores some project specific infos

View file

@ -54,9 +54,9 @@ import org.wesnoth.builder.DependencyListNode;
import org.wesnoth.projects.ProjectUtils;
import org.wesnoth.templates.ReplaceableParameter;
import org.wesnoth.templates.TemplateProvider;
import org.wesnoth.wml.SimpleWMLParser;
import org.wesnoth.wml.WMLMacroCall;
import org.wesnoth.wml.WMLRoot;
import org.wesnoth.wml.core.SimpleWMLParser;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;

View file

@ -6,7 +6,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
package org.wesnoth.wml.core;
package org.wesnoth.wml;
import java.io.BufferedReader;
import java.io.IOException;
@ -18,7 +18,6 @@ import java.util.List;
import org.wesnoth.Logger;
import org.wesnoth.utils.StringUtils;
import org.wesnoth.wml.WMLTag;
import org.wesnoth.wml.WmlFactory2;
/**
* This is a simple Lua parser that returns the found interesting tokens

View file

@ -6,7 +6,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
package org.wesnoth.wml.core;
package org.wesnoth.wml;
import java.util.ArrayList;
import java.util.List;
@ -19,12 +19,7 @@ import org.wesnoth.Logger;
import org.wesnoth.projects.ProjectCache;
import org.wesnoth.utils.ResourceUtils;
import org.wesnoth.utils.WMLUtils;
import org.wesnoth.wml.WMLKey;
import org.wesnoth.wml.WMLLuaCode;
import org.wesnoth.wml.WMLMacroCall;
import org.wesnoth.wml.WMLRoot;
import org.wesnoth.wml.WMLTag;
import org.wesnoth.wml.core.WMLVariable.Scope;
import org.wesnoth.wml.WMLVariable.Scope;
import com.google.common.base.Preconditions;
@ -128,8 +123,6 @@ public class SimpleWMLParser
}
}
//TODO: parse custom events
System.out.println( "parsed config: " + config_ );
}
protected String getVariableNameByContext( EObject context )
@ -175,7 +168,6 @@ public class SimpleWMLParser
// couldn't find any scope. Add a new one then.
variable.getScopes( ).add( new Scope( dependencyIndex_, nodeOffset ) );
System.out.println( "new scope for variable:" + variable );
}
protected void handleUnsetVariable( EObject context )
@ -203,7 +195,6 @@ public class SimpleWMLParser
scope.EndIndex = dependencyIndex_;
scope.EndOffset = nodeOffset;
System.out.println( "new end for variable:" + variable );
return;
}
}

View file

@ -6,7 +6,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
package org.wesnoth.wml.core;
package org.wesnoth.wml;
import java.io.Serializable;

View file

@ -6,7 +6,7 @@
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
package org.wesnoth.wml.core;
package org.wesnoth.wml;
import java.io.Serializable;
import java.util.ArrayList;