Move TokenizerConfig stuff to its own subpackage

nuthatchery · Dec 13, 2014 · 91e7922 · 91e7922
1 parent 1afa5c3
commit 91e7922
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 9 deletions.
diff --git a/pgf-experimental/META-INF/MANIFEST.MF b/pgf-experimental/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@ Require-Bundle: org.eclipse.ui,
  nuthatch
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Export-Package: org.nuthatchery.pgf.examples,
+Export-Package: org.nuthatchery.pgf.config,
+ org.nuthatchery.pgf.examples,
  org.nuthatchery.pgf.experimental,
  org.nuthatchery.pgf.plumbing,
  org.nuthatchery.pgf.plumbing.impl,

diff --git a/...hery/pgf/rascal/uptr/TokenizerConfig.java → ...thatchery/pgf/config/TokenizerConfig.java b/...hery/pgf/rascal/uptr/TokenizerConfig.java → ...thatchery/pgf/config/TokenizerConfig.java
@@ -1,4 +1,4 @@
-package org.nuthatchery.pgf.rascal.uptr;
+package org.nuthatchery.pgf.config;
 
 import java.util.Set;
 

diff --git a/.../pgf/rascal/uptr/TokenizerConfigBase.java → ...chery/pgf/config/TokenizerConfigBase.java b/.../pgf/rascal/uptr/TokenizerConfigBase.java → ...chery/pgf/config/TokenizerConfigBase.java
@@ -1,4 +1,4 @@
-package org.nuthatchery.pgf.rascal.uptr;
+package org.nuthatchery.pgf.config;
 
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;

diff --git a/pgf-experimental/src/org/nuthatchery/pgf/rascal/uptr/UPTRTokenizer.java b/pgf-experimental/src/org/nuthatchery/pgf/rascal/uptr/UPTRTokenizer.java
@@ -7,6 +7,7 @@
 import org.eclipse.imp.pdb.facts.IList;
 import org.eclipse.imp.pdb.facts.ISourceLocation;
 import org.eclipse.imp.pdb.facts.IValue;
+import org.nuthatchery.pgf.config.TokenizerConfig;
 import org.nuthatchery.pgf.plumbing.ForwardStream;
 import org.nuthatchery.pgf.tokens.Category;
 import org.nuthatchery.pgf.tokens.CategoryStore;

diff --git a/pgf-experimental/src/org/nuthatchery/pgf/tokens/TokenizerHelper.java b/pgf-experimental/src/org/nuthatchery/pgf/tokens/TokenizerHelper.java
@@ -3,8 +3,8 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.nuthatchery.pgf.config.TokenizerConfig;
 import org.nuthatchery.pgf.plumbing.ForwardStream;
-import org.nuthatchery.pgf.rascal.uptr.TokenizerConfig;
 
 public class TokenizerHelper {
 	public static final Pattern patLayout = Pattern.compile("^(\\s*)(.*\\S)(\\s*)$", Pattern.DOTALL);

diff --git a/pgf-experimental/src/org/nuthatchery/pgf/trees/PPBuilder.java b/pgf-experimental/src/org/nuthatchery/pgf/trees/PPBuilder.java
@@ -7,9 +7,9 @@
 import java.util.List;
 import java.util.regex.Matcher;
 
+import org.nuthatchery.pgf.config.TokenizerConfig;
 import org.nuthatchery.pgf.plumbing.ForwardStream;
 import org.nuthatchery.pgf.plumbing.impl.BufferedSyncPipeComponent;
-import org.nuthatchery.pgf.rascal.uptr.TokenizerConfig;
 import org.nuthatchery.pgf.tokens.Category;
 import org.nuthatchery.pgf.tokens.DataToken;
 import org.nuthatchery.pgf.tokens.Token;

diff --git a/pgf-experimental/test/org/nuthatchery/pgf/test/trees/PPBuilderTest.java b/pgf-experimental/test/org/nuthatchery/pgf/test/trees/PPBuilderTest.java
@@ -21,8 +21,8 @@
 
 import org.junit.Before;
 import org.junit.Test;
-import org.nuthatchery.pgf.rascal.uptr.TokenizerConfig;
-import org.nuthatchery.pgf.rascal.uptr.TokenizerConfigBase;
+import org.nuthatchery.pgf.config.TokenizerConfig;
+import org.nuthatchery.pgf.config.TokenizerConfigBase;
 import org.nuthatchery.pgf.tokens.CategoryStore;
 import org.nuthatchery.pgf.trees.PPBuilder;
 import org.nuthatchery.pgf.trees.PrettyPrinter;

diff --git a/pgf-java-formatter/src/org/nuthatchery/pgf/javaformatter/AsFix2Tokenizer.java b/pgf-java-formatter/src/org/nuthatchery/pgf/javaformatter/AsFix2Tokenizer.java
@@ -29,8 +29,8 @@
 import nuthatch.stratego.adapter.STermCursor;
 import nuthatch.stratego.adapter.SWalker;
 
+import org.nuthatchery.pgf.config.TokenizerConfig;
 import org.nuthatchery.pgf.plumbing.ForwardStream;
-import org.nuthatchery.pgf.rascal.uptr.TokenizerConfig;
 import org.nuthatchery.pgf.tokens.CategoryStore;
 import org.nuthatchery.pgf.tokens.CtrlToken;
 import org.nuthatchery.pgf.tokens.DataToken;

diff --git a/pgf-java-formatter/src/org/nuthatchery/pgf/javaformatter/JavaFormatter.java b/pgf-java-formatter/src/org/nuthatchery/pgf/javaformatter/JavaFormatter.java
@@ -13,10 +13,10 @@
 import nuthatch.javafront.JavaParser;
 import nuthatch.stratego.adapter.STermCursor;
 
+import org.nuthatchery.pgf.config.TokenizerConfigBase;
 import org.nuthatchery.pgf.plumbing.ForwardPipe;
 import org.nuthatchery.pgf.plumbing.impl.BufferedSyncPipeComponent;
 import org.nuthatchery.pgf.processors.CopyProcessor;
-import org.nuthatchery.pgf.rascal.uptr.TokenizerConfigBase;
 import org.nuthatchery.pgf.tokens.CategoryStore;
 import org.nuthatchery.pgf.tokens.Token;
 import org.nuthatchery.pgf.tokens.TokensToString;