eclipse plugin: move some methods to a better place...
...to reflect their usage targets
This commit is contained in:
Timotei Dolean
parent
afecd349ad
commit
cb5c761715
5 changed files with 202 additions and 210 deletions
|
|
@ -197,9 +197,9 @@ public class WesnothProjectBuilder extends IncrementalProjectBuilder
|
|||
monitor.subTask("Gathering file information...");
|
||||
ProjectCache projCache = ProjectUtils.getCacheForProject(getProject());
|
||||
|
||||
if (ProjectUtils.isScenarioFile(file.getLocation().toOSString()))
|
||||
if (ResourceUtils.isScenarioFile(file.getLocation().toOSString()))
|
||||
{
|
||||
WMLSaxHandler handler = ProjectUtils.
|
||||
WMLSaxHandler handler = ResourceUtils.
|
||||
getParsedWMLFromResource(PreprocessorUtils.getPreprocessedFilePath(file, false, false).toString());
|
||||
if (handler == null || handler.ScenarioId == null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ public class GameUtils
|
|||
IResource selectedResource = WorkspaceUtils.getSelectedResource();
|
||||
|
||||
if (scenario &&
|
||||
!ProjectUtils.isScenarioFile(
|
||||
!ResourceUtils.isScenarioFile(
|
||||
WorkspaceUtils.getPathRelativeToUserDir(selectedResource)))
|
||||
{
|
||||
GUIUtils.showErrorMessageBox("This is not a valid scenario file.");
|
||||
|
|
@ -73,10 +73,10 @@ public class GameUtils
|
|||
|
||||
try
|
||||
{
|
||||
String campaignId = ProjectUtils.getCampaignID(selectedResource);
|
||||
String campaignId = ResourceUtils.getCampaignID(selectedResource);
|
||||
String scenarioId = null;
|
||||
if (scenario == true && selectedResource instanceof IFile)
|
||||
scenarioId = ProjectUtils.getScenarioID((IFile)selectedResource);
|
||||
scenarioId = ResourceUtils.getScenarioID((IFile)selectedResource);
|
||||
|
||||
if (campaignId == null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -8,25 +8,11 @@
|
|||
*******************************************************************************/
|
||||
package wesnoth_eclipse_plugin.utils;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.StringReader;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Properties;
|
||||
|
||||
import javax.xml.parsers.SAXParser;
|
||||
import javax.xml.parsers.SAXParserFactory;
|
||||
|
||||
import org.eclipse.core.resources.IContainer;
|
||||
import org.eclipse.core.resources.IFile;
|
||||
import org.eclipse.core.resources.IFolder;
|
||||
import org.eclipse.core.resources.IProject;
|
||||
import org.eclipse.core.resources.IResource;
|
||||
import org.eclipse.core.runtime.Path;
|
||||
import org.xml.sax.InputSource;
|
||||
import org.xml.sax.SAXException;
|
||||
|
||||
import wesnoth_eclipse_plugin.Logger;
|
||||
|
||||
public class ProjectUtils
|
||||
{
|
||||
|
|
@ -89,188 +75,4 @@ public class ProjectUtils
|
|||
{
|
||||
getCacheForProject(project).saveCache();
|
||||
}
|
||||
|
||||
//TODO: create a simple java wmlparsers in order to get the right values
|
||||
public static String getConfigKeyValue(String fileName, String propertyName)
|
||||
{
|
||||
if (fileName == null || propertyName.isEmpty())
|
||||
return null;
|
||||
|
||||
String value = "";
|
||||
File file = new File(fileName);
|
||||
if (!file.exists())
|
||||
return null;
|
||||
|
||||
String fileContents = ResourceUtils.getFileContents(file);
|
||||
if (fileContents == null)
|
||||
return null;
|
||||
|
||||
int index = fileContents.indexOf(propertyName + "=");
|
||||
if (index == -1)
|
||||
{
|
||||
Logger.getInstance().log(String.format("property %s not found in file %s",
|
||||
propertyName, fileName));
|
||||
return null;
|
||||
}
|
||||
index += (propertyName.length() + 1); // jump over the property name characters
|
||||
|
||||
// skipp spaces between the property name and value (if any)
|
||||
while(index < fileContents.length() && fileContents.charAt(index) == ' ')
|
||||
++index;
|
||||
|
||||
while(index < fileContents.length() && fileContents.charAt(index) != '#' &&
|
||||
fileContents.charAt(index) != ' ' &&
|
||||
fileContents.charAt(index) != '\r' && fileContents.charAt(index) != '\n')
|
||||
{
|
||||
value += fileContents.charAt(index);
|
||||
++index;
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns "_main.cfg" file
|
||||
* from the specified resource or null if it isn't any
|
||||
* It will start searching upwards starting from curren
|
||||
* resource's directory, until it finds a '_main.cfg' but it will
|
||||
* stop when encounters a project
|
||||
*
|
||||
* @param resource The resource where to search for '_main.cfg'
|
||||
* @return
|
||||
*/
|
||||
public static IFile getMainConfigLocation(IResource resource)
|
||||
{
|
||||
if (resource == null)
|
||||
return null;
|
||||
|
||||
IFile targetResource = null;
|
||||
if (resource instanceof IProject)
|
||||
{
|
||||
IProject project = (IProject)resource;
|
||||
if (project.getFile("_main.cfg").exists())
|
||||
targetResource = project.getFile("_main.cfg");
|
||||
}
|
||||
|
||||
if (targetResource == null && resource instanceof IFolder)
|
||||
{
|
||||
IFolder folder = (IFolder)resource;
|
||||
if (folder.getFile(new Path("_main.cfg")).exists())
|
||||
targetResource = folder.getFile(new Path("_main.cfg"));
|
||||
}
|
||||
|
||||
if (targetResource == null && resource instanceof IFile)
|
||||
{
|
||||
if (resource.getName().equals("_main.cfg"))
|
||||
targetResource = (IFile) resource;
|
||||
else
|
||||
{
|
||||
IProject project = resource.getProject();
|
||||
if (project.getFile("_main.cfg").exists())
|
||||
targetResource = project.getFile("_main.cfg");
|
||||
else
|
||||
{
|
||||
// this might be the case of "user addon's" project
|
||||
// we're going to the first subdirectory under the project
|
||||
IContainer container = resource.getParent();
|
||||
if (container != null)
|
||||
{
|
||||
while(container.getParent() != null &&
|
||||
container.getParent() != resource.getProject())
|
||||
{
|
||||
container = container.getParent();
|
||||
}
|
||||
IFile file = project.getFile(
|
||||
container.getProjectRelativePath().toOSString() + "/_main.cfg");
|
||||
if (file.exists())
|
||||
targetResource = file;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (targetResource == null)
|
||||
return null;
|
||||
return targetResource;
|
||||
}
|
||||
|
||||
/**
|
||||
* 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)}
|
||||
* @param resource The resource where to search the id
|
||||
* @return
|
||||
*/
|
||||
public static String getCampaignID(IResource resource)
|
||||
{
|
||||
WMLSaxHandler handler = getParsedWMLFromResource(
|
||||
PreprocessorUtils.getPreprocessedFilePath(
|
||||
getMainConfigLocation(resource), false, true).toString());
|
||||
if (handler == null)
|
||||
return null;
|
||||
return handler.CampaignId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the campaign id
|
||||
* @param fileName
|
||||
* @return
|
||||
*/
|
||||
public static String getScenarioID(IFile file)
|
||||
{
|
||||
WMLSaxHandler handler = getParsedWMLFromResource(
|
||||
PreprocessorUtils.getPreprocessedFilePath(file, false, true).toString());
|
||||
if (handler == null)
|
||||
return null;
|
||||
return handler.ScenarioId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the WMLSaxHandler for the parsed specified resource
|
||||
* @param resourcePath The resourcepath to parse
|
||||
* @return
|
||||
*/
|
||||
public static WMLSaxHandler getParsedWMLFromResource(String resourcePath)
|
||||
{
|
||||
ExternalToolInvoker parser = WMLTools.runWMLParser2(resourcePath);
|
||||
if (parser == null)
|
||||
return null;
|
||||
try{
|
||||
parser.waitForTool();
|
||||
SAXParser saxparser;
|
||||
saxparser = SAXParserFactory.newInstance().newSAXParser();
|
||||
|
||||
WMLSaxHandler handler = new WMLSaxHandler();
|
||||
saxparser.parse(new InputSource(new StringReader(parser.getOutputContent())), handler);
|
||||
return handler;
|
||||
}
|
||||
catch (SAXException e) {
|
||||
Logger.getInstance().logException(e);
|
||||
Logger.getInstance().logError("Using output: " + parser.getOutputContent());
|
||||
return null;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Logger.getInstance().logException(e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean isCampaignFile(String fileName)
|
||||
{
|
||||
if (!fileName.endsWith(".cfg"))
|
||||
return false;
|
||||
//TODO: replace this with a better checking
|
||||
String fileContentString = ResourceUtils.getFileContents(new File(fileName));
|
||||
return (fileContentString.contains("[campaign]") && fileContentString.contains("[/campaign]"));
|
||||
}
|
||||
public static boolean isScenarioFile(String fileName)
|
||||
{
|
||||
if (!fileName.endsWith(".cfg"))
|
||||
return false;
|
||||
//TODO: replace this with a better checkings
|
||||
String fileContentString = ResourceUtils.getFileContents(new File(fileName));
|
||||
return (fileContentString.contains("[scenario]") && fileContentString.contains("[/scenario]"));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -18,8 +18,13 @@ import java.io.IOException;
|
|||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.io.OutputStream;
|
||||
import java.io.StringReader;
|
||||
import java.util.List;
|
||||
|
||||
import javax.xml.parsers.SAXParser;
|
||||
import javax.xml.parsers.SAXParserFactory;
|
||||
|
||||
import org.eclipse.core.resources.IContainer;
|
||||
import org.eclipse.core.resources.IFile;
|
||||
import org.eclipse.core.resources.IFolder;
|
||||
import org.eclipse.core.resources.IProject;
|
||||
|
|
@ -27,7 +32,10 @@ import org.eclipse.core.resources.IResource;
|
|||
import org.eclipse.core.runtime.CoreException;
|
||||
import org.eclipse.core.runtime.IStatus;
|
||||
import org.eclipse.core.runtime.NullProgressMonitor;
|
||||
import org.eclipse.core.runtime.Path;
|
||||
import org.eclipse.swt.SWT;
|
||||
import org.xml.sax.InputSource;
|
||||
import org.xml.sax.SAXException;
|
||||
|
||||
import wesnoth_eclipse_plugin.Logger;
|
||||
import wesnoth_eclipse_plugin.templates.ReplaceableParameter;
|
||||
|
|
@ -231,4 +239,186 @@ public class ResourceUtils
|
|||
Logger.getInstance().logException(e);
|
||||
}
|
||||
}
|
||||
|
||||
//TODO: create a simple java wmlparsers in order to get the right values
|
||||
public static String getConfigKeyValue(String fileName, String propertyName)
|
||||
{
|
||||
if (fileName == null || propertyName.isEmpty())
|
||||
return null;
|
||||
|
||||
String value = "";
|
||||
File file = new File(fileName);
|
||||
if (!file.exists())
|
||||
return null;
|
||||
|
||||
String fileContents = ResourceUtils.getFileContents(file);
|
||||
if (fileContents == null)
|
||||
return null;
|
||||
|
||||
int index = fileContents.indexOf(propertyName + "=");
|
||||
if (index == -1)
|
||||
{
|
||||
Logger.getInstance().log(String.format("property %s not found in file %s",
|
||||
propertyName, fileName));
|
||||
return null;
|
||||
}
|
||||
index += (propertyName.length() + 1); // jump over the property name characters
|
||||
|
||||
// skipp spaces between the property name and value (if any)
|
||||
while(index < fileContents.length() && fileContents.charAt(index) == ' ')
|
||||
++index;
|
||||
|
||||
while(index < fileContents.length() && fileContents.charAt(index) != '#' &&
|
||||
fileContents.charAt(index) != ' ' &&
|
||||
fileContents.charAt(index) != '\r' && fileContents.charAt(index) != '\n')
|
||||
{
|
||||
value += fileContents.charAt(index);
|
||||
++index;
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns "_main.cfg" file
|
||||
* from the specified resource or null if it isn't any
|
||||
* It will start searching upwards starting from curren
|
||||
* resource's directory, until it finds a '_main.cfg' but it will
|
||||
* stop when encounters a project
|
||||
*
|
||||
* @param resource The resource where to search for '_main.cfg'
|
||||
* @return
|
||||
*/
|
||||
public static IFile getMainConfigLocation(IResource resource)
|
||||
{
|
||||
if (resource == null)
|
||||
return null;
|
||||
|
||||
IFile targetResource = null;
|
||||
if (resource instanceof IProject)
|
||||
{
|
||||
IProject project = (IProject)resource;
|
||||
if (project.getFile("_main.cfg").exists())
|
||||
targetResource = project.getFile("_main.cfg");
|
||||
}
|
||||
|
||||
if (targetResource == null && resource instanceof IFolder)
|
||||
{
|
||||
IFolder folder = (IFolder)resource;
|
||||
if (folder.getFile(new Path("_main.cfg")).exists())
|
||||
targetResource = folder.getFile(new Path("_main.cfg"));
|
||||
}
|
||||
|
||||
if (targetResource == null && resource instanceof IFile)
|
||||
{
|
||||
if (resource.getName().equals("_main.cfg"))
|
||||
targetResource = (IFile) resource;
|
||||
else
|
||||
{
|
||||
IProject project = resource.getProject();
|
||||
if (project.getFile("_main.cfg").exists())
|
||||
targetResource = project.getFile("_main.cfg");
|
||||
else
|
||||
{
|
||||
// this might be the case of "user addon's" project
|
||||
// we're going to the first subdirectory under the project
|
||||
IContainer container = resource.getParent();
|
||||
if (container != null)
|
||||
{
|
||||
while(container.getParent() != null &&
|
||||
container.getParent() != resource.getProject())
|
||||
{
|
||||
container = container.getParent();
|
||||
}
|
||||
IFile file = project.getFile(
|
||||
container.getProjectRelativePath().toOSString() + "/_main.cfg");
|
||||
if (file.exists())
|
||||
targetResource = file;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (targetResource == null)
|
||||
return null;
|
||||
return targetResource;
|
||||
}
|
||||
|
||||
/**
|
||||
* 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)}
|
||||
* @param resource The resource where to search the id
|
||||
* @return
|
||||
*/
|
||||
public static String getCampaignID(IResource resource)
|
||||
{
|
||||
WMLSaxHandler handler = getParsedWMLFromResource(
|
||||
PreprocessorUtils.getPreprocessedFilePath(
|
||||
getMainConfigLocation(resource), false, true).toString());
|
||||
if (handler == null)
|
||||
return null;
|
||||
return handler.CampaignId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the campaign id
|
||||
* @param fileName
|
||||
* @return
|
||||
*/
|
||||
public static String getScenarioID(IFile file)
|
||||
{
|
||||
WMLSaxHandler handler = getParsedWMLFromResource(
|
||||
PreprocessorUtils.getPreprocessedFilePath(file, false, true).toString());
|
||||
if (handler == null)
|
||||
return null;
|
||||
return handler.ScenarioId;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the WMLSaxHandler for the parsed specified resource
|
||||
* @param resourcePath The resourcepath to parse
|
||||
* @return
|
||||
*/
|
||||
public static WMLSaxHandler getParsedWMLFromResource(String resourcePath)
|
||||
{
|
||||
ExternalToolInvoker parser = WMLTools.runWMLParser2(resourcePath);
|
||||
if (parser == null)
|
||||
return null;
|
||||
try{
|
||||
parser.waitForTool();
|
||||
SAXParser saxparser;
|
||||
saxparser = SAXParserFactory.newInstance().newSAXParser();
|
||||
|
||||
WMLSaxHandler handler = new WMLSaxHandler();
|
||||
saxparser.parse(new InputSource(new StringReader(parser.getOutputContent())), handler);
|
||||
return handler;
|
||||
}
|
||||
catch (SAXException e) {
|
||||
Logger.getInstance().logException(e);
|
||||
Logger.getInstance().logError("Using output: " + parser.getOutputContent());
|
||||
return null;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Logger.getInstance().logException(e);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean isCampaignFile(String fileName)
|
||||
{
|
||||
if (!fileName.endsWith(".cfg"))
|
||||
return false;
|
||||
//TODO: replace this with a better checking
|
||||
String fileContentString = ResourceUtils.getFileContents(new File(fileName));
|
||||
return (fileContentString.contains("[campaign]") && fileContentString.contains("[/campaign]"));
|
||||
}
|
||||
public static boolean isScenarioFile(String fileName)
|
||||
{
|
||||
if (!fileName.endsWith(".cfg"))
|
||||
return false;
|
||||
//TODO: replace this with a better checkings
|
||||
String fileContentString = ResourceUtils.getFileContents(new File(fileName));
|
||||
return (fileContentString.contains("[scenario]") && fileContentString.contains("[/scenario]"));
|
||||
}
|
||||
}
|
||||
|
|
@ -22,28 +22,28 @@ public class WMLSaxHandler extends DefaultHandler
|
|||
public String CampaignId = null;
|
||||
public String ScenarioId = null;
|
||||
|
||||
private static Stack<String> stack;
|
||||
private static Stack<String> stack_;
|
||||
public WMLSaxHandler()
|
||||
{
|
||||
stack = new Stack<String>();
|
||||
stack_ = new Stack<String>();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void startElement(String uri, String localName,
|
||||
String rawName, Attributes attributes)
|
||||
{
|
||||
stack.push(rawName);
|
||||
stack_.push(rawName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void characters(char[] ch, int start, int length)
|
||||
throws SAXException
|
||||
{
|
||||
if (stack.peek().equals("id"))
|
||||
if (stack_.peek().equals("id"))
|
||||
{
|
||||
if (stack.get(stack.size() - 2).equals("campaign"))
|
||||
if (stack_.get(stack_.size() - 2).equals("campaign"))
|
||||
CampaignId = new String(ch, start, length);
|
||||
else if (stack.get(stack.size() - 2).equals("scenario"))
|
||||
else if (stack_.get(stack_.size() - 2).equals("scenario"))
|
||||
ScenarioId = new String(ch, start, length);
|
||||
}
|
||||
super.characters(ch, start, length);
|
||||
|
|
@ -53,7 +53,7 @@ public class WMLSaxHandler extends DefaultHandler
|
|||
throws SAXException
|
||||
{
|
||||
super.endElement(uri, localName, qName);
|
||||
stack.pop();
|
||||
stack_.pop();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue