Eclipse Community Forums: EMF

Help

Home

Home » Modeling » EMF » JMerge question

Show: Today's Messages :: Show Polls :: Message Navigator

JMerge question [message #426894]

Fri, 23 January 2009 19:01

J F

Messages: 256
Registered: July 2009

Senior Member

I have a merge.xml file;

<?xml version="1.0" encoding="UTF-8" ?>
<merge:options
xmlns:merge=" http://www.eclipse.org/org/eclipse/emf/codegen/jmerge/Option s">

<merge:dictionaryPatten
name="getCommon"
select="Method/getName"
match="(get)Common"/>

<merge:pull
targetMarkup="^get$"
sourceGet="Method/getBody"
targetPut="Method/setBody" />

</merge:options>

The source ( i.e. the generated file ) is as follows;

package test;

public class TheClass
{
public void getCommon()
{
System.out.println("Generated");
}
}

The target as follows;

package test;

public class TheClass
{
public void getCommon()
{
System.out.println("Edited");
}
}

The output is;

package test;

public class TheClass
{
public void getCommon()
{
System.out.println("Edited");
}
}

Surely it should use the source or generated method body?

I have tried other regex like expressions for the dictionaryPattern match
attribute value;

match=".*(get)Common.*"

match=".*(get)\w+"

match="^(get)\w+$"

to no avail...

What am I doing wrong?

I use the following to run the merge under an OSGi (Declarative) Service;

public class Test
{

/**
* @param args
*/
public static void main(String[] args)
{
try
{
System.out.println("Run Merge");
String dir = "C:/path/to/workspace/JMergeTest/sources/";
String generatedFilePath = dir + "generated/TheClass.java";
String alteredFilePath = dir + "edited/TheClass.java";
String mergedFilePath = dir + "mergeoutput/TheClass.java";

// ...
JMerger merger = getJMerger();

String generated = getSource(generatedFilePath);
String altered = getSource(alteredFilePath);

// set source
merger.setSourceCompilationUnit(
merger.createCompilationUnitForContents(generated));

// set target
merger.setTargetCompilationUnit(
merger.createCompilationUnitForContents(altered));

// merge source and target
merger.merge();

// extract merged contents and write them out
writeSource(mergedFilePath, merger.getTargetCompilationUnitContents());
}
catch(Throwable t)
{
System.out.println("Unexpected error "+ t);
t.printStackTrace();
}
finally
{
System.out.println("Merge run");
}
}

private static void writeSource(String mergedFilePath,
String targetCompilationUnitContents) throws IOException
{
PrintWriter out = new PrintWriter(new FileWriter(mergedFilePath));
out.print(targetCompilationUnitContents);
out.close();
}

private static String getSource(String filePath) throws IOException
{
BufferedReader reader = new BufferedReader( new FileReader(filePath));
String line;
String contents = "";
while((line = reader.readLine()) != null )
{
contents += (line + "\n");
}
return contents;
}

private static JMerger getJMerger() {
// build URI for merge document
String uri = "file:///path/to/workspace/JMergeTest/";
uri += "templates/merge.xml";

JControlModel controlModel = new JControlModel();
controlModel.initialize(new JDOMFacadeHelper(), uri);
JMerger jmerger = new JMerger(controlModel);
return jmerger;
}

}

Report message to a moderator

Re: JMerge question [message #426898 is a reply to message #426894]

Fri, 23 January 2009 22:25

Ed Merks

Messages: 33140
Registered: July 2009

Senior Member

JF,

Comments below.

JF wrote:
> I have a merge.xml file;
>
> <?xml version="1.0" encoding="UTF-8" ?> <merge:options
> xmlns:merge=" http://www.eclipse.org/org/eclipse/emf/codegen/jmerge/Option s">
>
>
>
> <merge:dictionaryPatten
> name="getCommon"
> select="Method/getName"
> match="(get)Common"/>
>
> <merge:pull
> targetMarkup="^get$"
> sourceGet="Method/getBody"
> targetPut="Method/setBody" />
>
>
> </merge:options>
>
> The source ( i.e. the generated file ) is as follows;
>
> package test;
>
> public class TheClass
> {
> public void getCommon() {
> System.out.println("Generated");
> }
> }
>
>
> The target as follows;
>
> package test;
>
> public class TheClass
> {
> public void getCommon() {
> System.out.println("Edited");
> }
> }
>
> The output is;
>
> package test;
>
> public class TheClass
> {
> public void getCommon() {
> System.out.println("Edited");
> }
> }
>
>
> Surely it should use the source or generated method body?
Nothing jumps out as obviously wrong.
>
> I have tried other regex like expressions for the dictionaryPattern
> match attribute value;
>
> match=".*(get)Common.*"
>
> match=".*(get)\w+"
>
> match="^(get)\w+$"
>
> to no avail...
>
> What am I doing wrong?
>
>
> I use the following to run the merge under an OSGi (Declarative) Service;
>
> public class Test
> {
>
> /**
> * @param args
> */
> public static void main(String[] args)
> {
> try
> {
> System.out.println("Run Merge");
> String dir = "C:/path/to/workspace/JMergeTest/sources/";
> String generatedFilePath = dir + "generated/TheClass.java";
> String alteredFilePath = dir + "edited/TheClass.java";
> String mergedFilePath = dir + "mergeoutput/TheClass.java";
>
> // ...
> JMerger merger = getJMerger();
>
> String generated = getSource(generatedFilePath);
> String altered = getSource(alteredFilePath);
>
> // set source
> merger.setSourceCompilationUnit(
> merger.createCompilationUnitForContents(generated));
>
> // set target
> merger.setTargetCompilationUnit(
> merger.createCompilationUnitForContents(altered));
>
> // merge source and target
> merger.merge();
>
> // extract merged contents and write them out
> writeSource(mergedFilePath,
> merger.getTargetCompilationUnitContents());
> }
> catch(Throwable t)
> {
> System.out.println("Unexpected error "+ t);
> t.printStackTrace();
> }
> finally
> {
> System.out.println("Merge run");
> }
> }
>
>
> private static void writeSource(String mergedFilePath,
> String
> targetCompilationUnitContents) throws IOException
> {
> PrintWriter out = new PrintWriter(new
> FileWriter(mergedFilePath));
> out.print(targetCompilationUnitContents);
> out.close();
> }
>
>
> private static String getSource(String filePath) throws IOException
> {
> BufferedReader reader = new BufferedReader( new
> FileReader(filePath));
> String line;
> String contents = "";
> while((line = reader.readLine()) != null )
> {
> contents += (line + "\n");
> }
> return contents;
> }
>
>
> private static JMerger getJMerger() {
> // build URI for merge document
> String uri = "file:///path/to/workspace/JMergeTest/";
> uri += "templates/merge.xml";
>
> JControlModel controlModel = new JControlModel();
> controlModel.initialize(new JDOMFacadeHelper(), uri);
> JMerger jmerger = new JMerger(controlModel);
> return jmerger;
> }
>
> }
If you package up something I can run (exported zipped projects), I'll
have a look to figure out what's going wrong.

Ed Merks
Professional Support: https://www.macromodeling.com/

Report message to a moderator