diff --git a/AbsSumAnnotator/.classpath b/AbsSumAnnotator/.classpath
deleted file mode 100644
index b65cf41..0000000
--- a/AbsSumAnnotator/.classpath
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/AbsSumAnnotator/.gitignore b/AbsSumAnnotator/.gitignore
index 6b743b9..6cb1223 100644
--- a/AbsSumAnnotator/.gitignore
+++ b/AbsSumAnnotator/.gitignore
@@ -1,4 +1,4 @@
-*.class
-*~
-.settings/*
-target
+/target/
+.project
+.settings
+.classpath
diff --git a/AbsSumAnnotator/README.txt b/AbsSumAnnotator/README.txt
deleted file mode 100644
index 9d39fd0..0000000
--- a/AbsSumAnnotator/README.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-== Abstract Summary Annotator ==
-
-This is the README file.
\ No newline at end of file
diff --git a/AbsSumAnnotator/pom.xml b/AbsSumAnnotator/pom.xml
index 1f52a23..6d82593 100644
--- a/AbsSumAnnotator/pom.xml
+++ b/AbsSumAnnotator/pom.xml
@@ -1,10 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>ipipan.atlas</groupId>
+ <groupId>pl.waw.ipipan.zil.summarizer</groupId>
<artifactId>abssumannotator</artifactId>
- <version>0.1</version>
+ <version>1.0</version>
<name>AbsSumAnnotator</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
<build>
<plugins>
<plugin>
@@ -12,7 +15,7 @@
<configuration>
<archive>
<manifest>
- <mainClass>ipipan.atlas.abssumannotator.main.AbsSumAnnotator</mainClass>
+ <mainClass>pl.waw.ipipan.zil.summarizer.abssumannotator.main.AbsSumAnnotator</mainClass>
</manifest>
</archive>
<descriptorRefs>
@@ -20,6 +23,14 @@
</descriptorRefs>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
diff --git a/AbsSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/abssumannotator/basic/Text.java b/AbsSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/abssumannotator/basic/Text.java
index 50293f7..cd414d0 100644
--- a/AbsSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/abssumannotator/basic/Text.java
+++ b/AbsSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/abssumannotator/basic/Text.java
@@ -1,4 +1,4 @@
-package pl.waw.ipipan.zil.summarization.abssumannotator.basic;
+package pl.waw.ipipan.zil.summarizer.abssumannotator.basic;
import java.util.List;
diff --git a/AbsSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/abssumannotator/io/SummaryFileIO.java b/AbsSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/abssumannotator/io/SummaryFileIO.java
index 234b4ee..9d735b5 100644
--- a/AbsSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/abssumannotator/io/SummaryFileIO.java
+++ b/AbsSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/abssumannotator/io/SummaryFileIO.java
@@ -1,5 +1,4 @@
-package pl.waw.ipipan.zil.summarization.abssumannotator.io;
-
+package pl.waw.ipipan.zil.summarizer.abssumannotator.io;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -14,8 +13,8 @@ import java.util.List;
import org.apache.log4j.Logger;
-import pl.waw.ipipan.zil.summarization.abssumannotator.basic.Text;
-import pl.waw.ipipan.zil.summarization.abssumannotator.main.AbsSumAnnotator;
+import pl.waw.ipipan.zil.summarizer.abssumannotator.basic.Text;
+import pl.waw.ipipan.zil.summarizer.abssumannotator.main.AbsSumAnnotator;
public class SummaryFileIO {
diff --git a/AbsSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/abssumannotator/main/AbsSumAnnotator.java b/AbsSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/abssumannotator/main/AbsSumAnnotator.java
index a4eecba..7156e68 100644
--- a/AbsSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/abssumannotator/main/AbsSumAnnotator.java
+++ b/AbsSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/abssumannotator/main/AbsSumAnnotator.java
@@ -1,5 +1,4 @@
-package pl.waw.ipipan.zil.summarization.abssumannotator.main;
-
+package pl.waw.ipipan.zil.summarizer.abssumannotator.main;
import java.awt.Cursor;
import java.awt.Dimension;
@@ -37,14 +36,14 @@ import javax.swing.filechooser.FileFilter;
import org.apache.log4j.Logger;
-import pl.waw.ipipan.zil.summarization.abssumannotator.basic.Text;
-import pl.waw.ipipan.zil.summarization.abssumannotator.io.SummaryFileIO;
+import pl.waw.ipipan.zil.summarizer.abssumannotator.basic.Text;
+import pl.waw.ipipan.zil.summarizer.abssumannotator.io.SummaryFileIO;
public class AbsSumAnnotator extends JFrame implements Runnable {
public static final int SUMMARIES_COUNT = 3;
- private static final String WINDOW_TITLE = "ASE v0.9";
+ private static final String WINDOW_TITLE = "ASE v1.0";
private static final long serialVersionUID = -3830790411182131318L;
@@ -109,7 +108,7 @@ public class AbsSumAnnotator extends JFrame implements Runnable {
JSplitPane splitPane = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
splitPane.setTopComponent(new JScrollPane(textPane, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
- JScrollPane.HORIZONTAL_SCROLLBAR_NEVER));
+ JScrollPane.HORIZONTAL_SCROLLBAR_NEVER));
splitPane.setBottomComponent(tabbedPane);
splitPane.setDividerLocation(TEXT_HEIGTH);
this.getContentPane().add(splitPane);
@@ -284,7 +283,7 @@ public class AbsSumAnnotator extends JFrame implements Runnable {
return true;
int result = JOptionPane.showOptionDialog(this, "Do you want to save changes?", "Unsaved changes",
- JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null, null, null);
+ JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null, null, null);
if (result == JOptionPane.CANCEL_OPTION)
return false;
diff --git a/AbsSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/abssumannotator/main/MyTab.java b/AbsSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/abssumannotator/main/MyTab.java
index 87e7a58..7a60ff6 100644
--- a/AbsSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/abssumannotator/main/MyTab.java
+++ b/AbsSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/abssumannotator/main/MyTab.java
@@ -1,5 +1,4 @@
-package pl.waw.ipipan.zil.summarization.abssumannotator.main;
-
+package pl.waw.ipipan.zil.summarizer.abssumannotator.main;
import java.awt.BorderLayout;
import java.awt.Insets;
@@ -24,7 +23,7 @@ import javax.swing.undo.UndoManager;
import org.apache.log4j.Logger;
-import pl.waw.ipipan.zil.summarization.abssumannotator.basic.Text;
+import pl.waw.ipipan.zil.summarizer.abssumannotator.basic.Text;
public class MyTab extends JPanel {
diff --git a/AbsSumAnnotator/src/main/java/log4j.properties b/AbsSumAnnotator/src/main/resources/log4j.properties
index 9500239..6d8f00a 100644
--- a/AbsSumAnnotator/src/main/java/log4j.properties
+++ b/AbsSumAnnotator/src/main/resources/log4j.properties
@@ -2,4 +2,4 @@ log4j.appender.stderr=org.apache.log4j.ConsoleAppender
log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
log4j.appender.stderr.layout.ConversionPattern=[%p] [%C{1}] %m%n
-log4j.logger.pl.waw.ipipan.zil.summarization.abssumannotator=INFO, stderr
\ No newline at end of file
+log4j.logger.pl.waw.ipipan.zil=INFO, stderr
\ No newline at end of file
diff --git a/ClauseAnnotator/.classpath b/ClauseAnnotator/.classpath
deleted file mode 100644
index fc321d6..0000000
--- a/ClauseAnnotator/.classpath
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/ClauseAnnotator/.gitignore b/ClauseAnnotator/.gitignore
index 6b743b9..6cb1223 100644
--- a/ClauseAnnotator/.gitignore
+++ b/ClauseAnnotator/.gitignore
@@ -1,4 +1,4 @@
-*.class
-*~
-.settings/*
-target
+/target/
+.project
+.settings
+.classpath
diff --git a/ClauseAnnotator/pom.xml b/ClauseAnnotator/pom.xml
index a089c52..2b9c81f 100644
--- a/ClauseAnnotator/pom.xml
+++ b/ClauseAnnotator/pom.xml
@@ -1,10 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>ipipan.atlas</groupId>
+ <groupId>pl.waw.ipipan.zil.summarizer</groupId>
<artifactId>clauseannotator</artifactId>
- <version>0.1</version>
- <name>Clauseannotator</name>
+ <version>1.0</version>
+ <name>ClauseAnnotator</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
<build>
<plugins>
<plugin>
@@ -12,7 +15,7 @@
<configuration>
<archive>
<manifest>
- <mainClass>ipipan.atlas.clauseannotator.main.Clauseannotator</mainClass>
+ <mainClass>pl.waw.ipipan.zil.summarizer.clauseannotator.main.ClauseAnnotator</mainClass>
</manifest>
</archive>
<descriptorRefs>
@@ -20,6 +23,14 @@
</descriptorRefs>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
diff --git a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/basic/Clause.java b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/basic/Clause.java
index 052980f..ffa8970 100644
--- a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/basic/Clause.java
+++ b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/basic/Clause.java
@@ -1,4 +1,4 @@
-package pl.waw.ipipan.zil.summarization.clauseannotator.basic;
+package pl.waw.ipipan.zil.summarizer.clauseannotator.basic;
import java.util.ArrayList;
import java.util.List;
diff --git a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/basic/Document.java b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/basic/Document.java
index 74c3a67..08616c4 100644
--- a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/basic/Document.java
+++ b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/basic/Document.java
@@ -1,4 +1,4 @@
-package pl.waw.ipipan.zil.summarization.clauseannotator.basic;
+package pl.waw.ipipan.zil.summarizer.clauseannotator.basic;
import java.util.ArrayList;
import java.util.List;
diff --git a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/basic/Marker.java b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/basic/Marker.java
index 0ad5038..90964fa 100644
--- a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/basic/Marker.java
+++ b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/basic/Marker.java
@@ -1,4 +1,4 @@
-package pl.waw.ipipan.zil.summarization.clauseannotator.basic;
+package pl.waw.ipipan.zil.summarizer.clauseannotator.basic;
import java.util.ArrayList;
import java.util.List;
diff --git a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/basic/Sentence.java b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/basic/Sentence.java
index 23d7dc7..4c7e4a1 100644
--- a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/basic/Sentence.java
+++ b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/basic/Sentence.java
@@ -1,4 +1,4 @@
-package pl.waw.ipipan.zil.summarization.clauseannotator.basic;
+package pl.waw.ipipan.zil.summarizer.clauseannotator.basic;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/basic/Word.java b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/basic/Word.java
index 8e9d70e..2dd0f53 100644
--- a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/basic/Word.java
+++ b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/basic/Word.java
@@ -1,6 +1,6 @@
-package pl.waw.ipipan.zil.summarization.clauseannotator.basic;
+package pl.waw.ipipan.zil.summarizer.clauseannotator.basic;
-import pl.waw.ipipan.zil.summarization.clauseannotator.main.Clauseannotator;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.main.ClauseAnnotator;
public class Word {
@@ -50,9 +50,9 @@ public class Word {
}
public boolean isVerb() {
- if (Clauseannotator.VERB_POS_REGEXP == null)
+ if (ClauseAnnotator.VERB_POS_REGEXP == null)
return false;
- return pos.matches(Clauseannotator.VERB_POS_REGEXP);
+ return pos.matches(ClauseAnnotator.VERB_POS_REGEXP);
}
public Marker getMarker() {
diff --git a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/io/IdGenerator.java b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/io/IdGenerator.java
index 6c732da..54f5cdc 100644
--- a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/io/IdGenerator.java
+++ b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/io/IdGenerator.java
@@ -1,13 +1,12 @@
-package pl.waw.ipipan.zil.summarization.clauseannotator.io;
+package pl.waw.ipipan.zil.summarizer.clauseannotator.io;
import java.util.HashMap;
import java.util.Map;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Clause;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Marker;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Sentence;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Word;
-
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Clause;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Marker;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Sentence;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Word;
public class IdGenerator {
diff --git a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/io/XMLReader.java b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/io/XMLReader.java
index 954ced3..9a53fc8 100644
--- a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/io/XMLReader.java
+++ b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/io/XMLReader.java
@@ -1,5 +1,4 @@
-package pl.waw.ipipan.zil.summarization.clauseannotator.io;
-
+package pl.waw.ipipan.zil.summarizer.clauseannotator.io;
import java.io.File;
import java.io.FileInputStream;
@@ -14,11 +13,11 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.log4j.Logger;
import org.codehaus.stax2.XMLInputFactory2;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Clause;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Document;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Marker;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Sentence;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Word;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Clause;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Document;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Marker;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Sentence;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Word;
public class XMLReader {
@@ -84,7 +83,7 @@ public class XMLReader {
if (currentWord != null)
throw new Exception("Word starting before previous word finished in line: "
- + sr.getLocation().getLineNumber());
+ + sr.getLocation().getLineNumber());
currentWord = new Word(pos, lemma);
@@ -104,7 +103,7 @@ public class XMLReader {
if (currentSentence == null)
throw new Exception("Sentence ending before starting in line: "
- + sr.getLocation().getLineNumber());
+ + sr.getLocation().getLineNumber());
// for first-time read
if (currentClause != null)
@@ -122,7 +121,7 @@ public class XMLReader {
if (currentWord == null)
throw new Exception("Word ending before starting in line: "
- + sr.getLocation().getLineNumber());
+ + sr.getLocation().getLineNumber());
if (currentClause == null)
throw new Exception("Word not in a clause in line: " + sr.getLocation().getLineNumber());
@@ -133,7 +132,7 @@ public class XMLReader {
if (currentWord.getPos() == null)
throw new Exception("Word without pos attribute in line: "
- + sr.getLocation().getLineNumber());
+ + sr.getLocation().getLineNumber());
currentClause.add(currentWord);
currentWord = null;
@@ -145,7 +144,7 @@ public class XMLReader {
if (currentMarker == null)
throw new Exception("Marker ended before started in line: "
- + sr.getLocation().getLineNumber());
+ + sr.getLocation().getLineNumber());
currentMarker = null;
}
@@ -169,7 +168,7 @@ public class XMLReader {
Clause cont = id2Clause.get(contId);
if (cont == null)
throw new Exception("Clause with id: " + contId + " not found in line: "
- + sr.getLocation().getLineNumber());
+ + sr.getLocation().getLineNumber());
c.setContinuedClause(cont);
}
diff --git a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/io/XMLWriter.java b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/io/XMLWriter.java
index 44825d8..2fcdd61 100644
--- a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/io/XMLWriter.java
+++ b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/io/XMLWriter.java
@@ -1,5 +1,4 @@
-package pl.waw.ipipan.zil.summarization.clauseannotator.io;
-
+package pl.waw.ipipan.zil.summarizer.clauseannotator.io;
import java.io.BufferedWriter;
import java.io.File;
@@ -13,10 +12,10 @@ import javax.xml.stream.XMLStreamWriter;
import org.apache.log4j.Logger;
import org.codehaus.stax2.XMLOutputFactory2;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Clause;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Marker;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Sentence;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Word;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Clause;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Marker;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Sentence;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Word;
public class XMLWriter {
@@ -26,9 +25,9 @@ public class XMLWriter {
private static final String INDENT = " ";
public static boolean saveFile(File targetFile, List<Sentence> sentences) {
- return saveFile(targetFile, sentences, false, false);
+ return saveFile(targetFile, sentences, false, false);
}
-
+
public static boolean saveFile(File targetFile, List<Sentence> sentences, boolean omitClauses, boolean omitMarkers) {
logger.info("Saving sentences in file: " + targetFile);
BufferedWriter bw = null;
diff --git a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/main/BottomPanel.java b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/main/BottomPanel.java
index cd9e784..a2c83cc 100644
--- a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/main/BottomPanel.java
+++ b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/main/BottomPanel.java
@@ -1,5 +1,4 @@
-package pl.waw.ipipan.zil.summarization.clauseannotator.main;
-
+package pl.waw.ipipan.zil.summarizer.clauseannotator.main;
import java.awt.Component;
import java.awt.GridBagConstraints;
@@ -15,9 +14,9 @@ import javax.swing.JPanel;
import org.apache.log4j.Logger;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Clause;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Marker;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Word;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Clause;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Marker;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Word;
public class BottomPanel extends JPanel implements ItemListener {
diff --git a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/main/Clauseannotator.java b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/main/ClauseAnnotator.java
index 0f0f32c..4970d92 100644
--- a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/main/Clauseannotator.java
+++ b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/main/ClauseAnnotator.java
@@ -1,5 +1,4 @@
-package pl.waw.ipipan.zil.summarization.clauseannotator.main;
-
+package pl.waw.ipipan.zil.summarizer.clauseannotator.main;
import java.awt.Cursor;
import java.awt.Dimension;
@@ -32,17 +31,17 @@ import javax.swing.filechooser.FileFilter;
import org.apache.log4j.Logger;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Document;
-import pl.waw.ipipan.zil.summarization.clauseannotator.io.XMLReader;
-import pl.waw.ipipan.zil.summarization.clauseannotator.io.XMLWriter;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Document;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.io.XMLReader;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.io.XMLWriter;
-public class Clauseannotator extends JFrame implements Runnable {
+public class ClauseAnnotator extends JFrame implements Runnable {
private static final String WINDOW_TITLE = "Clause and marker annotator";
private static final long serialVersionUID = -3830790411182131318L;
- private static final Logger logger = Logger.getLogger(Clauseannotator.class);
+ private static final Logger logger = Logger.getLogger(ClauseAnnotator.class);
private static final int HEIGTH = 600;
private static final int WIDTH = 800;
@@ -62,10 +61,10 @@ public class Clauseannotator extends JFrame implements Runnable {
public static void main(String[] args) {
if (args.length != 0 && args.length != 1) {
- logger.error("Wrong usage! Should be: java -jar " + Clauseannotator.class.getSimpleName() + " [input file]");
+ logger.error("Wrong usage! Should be: java -jar " + ClauseAnnotator.class.getSimpleName() + " [input file]");
return;
}
- final Clauseannotator clauseannotator = new Clauseannotator();
+ final ClauseAnnotator clauseannotator = new ClauseAnnotator();
try {
SwingUtilities.invokeAndWait(clauseannotator);
} catch (Exception e) {
@@ -89,7 +88,7 @@ public class Clauseannotator extends JFrame implements Runnable {
}
private static void loadVerPosRegexp() {
- InputStream f = Clauseannotator.class.getClassLoader().getResourceAsStream(verbposregexpFilename);
+ InputStream f = ClauseAnnotator.class.getClassLoader().getResourceAsStream(verbposregexpFilename);
if (f != null) {
String regex = null;
try {
@@ -227,7 +226,7 @@ public class Clauseannotator extends JFrame implements Runnable {
JEditorPane editorPane = new JEditorPane();
editorPane.setEditable(false);
- URL helpURL = Clauseannotator.class.getClassLoader().getResource("help.html");
+ URL helpURL = ClauseAnnotator.class.getClassLoader().getResource("help.html");
if (helpURL != null) {
try {
editorPane.setPage(helpURL);
@@ -301,9 +300,9 @@ public class Clauseannotator extends JFrame implements Runnable {
private class MainWindowListener extends WindowAdapter {
- private Clauseannotator summanotator;
+ private ClauseAnnotator summanotator;
- public MainWindowListener(Clauseannotator sumannotator) {
+ public MainWindowListener(ClauseAnnotator sumannotator) {
this.summanotator = sumannotator;
}
diff --git a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/main/FixIds.java b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/main/FixIds.java
index 26afa9b..275de71 100644
--- a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/main/FixIds.java
+++ b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/main/FixIds.java
@@ -1,16 +1,15 @@
-package pl.waw.ipipan.zil.summarization.clauseannotator.main;
-
+package pl.waw.ipipan.zil.summarizer.clauseannotator.main;
import java.io.File;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Document;
-import pl.waw.ipipan.zil.summarization.clauseannotator.io.XMLReader;
-import pl.waw.ipipan.zil.summarization.clauseannotator.io.XMLWriter;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Document;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.io.XMLReader;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.io.XMLWriter;
public class FixIds {
public static void main(String[] args) {
-
+
File dir = new File(args[0]);
for (File f : dir.listFiles()) {
Document doc = new Document();
diff --git a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/main/MainDocument.java b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/main/MainDocument.java
index 3ecb7e7..9d87e37 100644
--- a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/main/MainDocument.java
+++ b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/main/MainDocument.java
@@ -1,5 +1,4 @@
-package pl.waw.ipipan.zil.summarization.clauseannotator.main;
-
+package pl.waw.ipipan.zil.summarizer.clauseannotator.main;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
@@ -17,10 +16,10 @@ import javax.swing.text.SimpleAttributeSet;
import org.apache.log4j.Logger;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Clause;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Marker;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Sentence;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Word;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Clause;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Marker;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Sentence;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Word;
public class MainDocument extends DefaultStyledDocument implements CaretListener, KeyListener {
diff --git a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/main/MainSplitPanel.java b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/main/MainSplitPanel.java
index df55787..77785c7 100644
--- a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/main/MainSplitPanel.java
+++ b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/main/MainSplitPanel.java
@@ -1,5 +1,4 @@
-package pl.waw.ipipan.zil.summarization.clauseannotator.main;
-
+package pl.waw.ipipan.zil.summarizer.clauseannotator.main;
import java.util.List;
@@ -8,21 +7,21 @@ import javax.swing.JSplitPane;
import org.apache.log4j.Logger;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Marker;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Sentence;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Word;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Marker;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Sentence;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Word;
public class MainSplitPanel extends JSplitPane {
private static final long serialVersionUID = 3656861958564714263L;
private static final Logger logger = Logger.getLogger(MainSplitPanel.class);
- private Clauseannotator clauseannotator;
+ private ClauseAnnotator clauseannotator;
private MainTextPane mainTextPane;
private BottomPanel bottomPanel;
- public MainSplitPanel(Clauseannotator clauseannotator) {
+ public MainSplitPanel(ClauseAnnotator clauseannotator) {
super(JSplitPane.VERTICAL_SPLIT);
this.clauseannotator = clauseannotator;
diff --git a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/main/MainTextPane.java b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/main/MainTextPane.java
index 3c076ab..2408333 100644
--- a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/main/MainTextPane.java
+++ b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/main/MainTextPane.java
@@ -1,5 +1,4 @@
-package pl.waw.ipipan.zil.summarization.clauseannotator.main;
-
+package pl.waw.ipipan.zil.summarizer.clauseannotator.main;
import java.awt.Insets;
import java.util.List;
@@ -8,10 +7,10 @@ import javax.swing.JTextPane;
import org.apache.log4j.Logger;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Clause;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Marker;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Sentence;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Word;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Clause;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Marker;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Sentence;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Word;
public class MainTextPane extends JTextPane {
@@ -191,8 +190,8 @@ public class MainTextPane extends JTextPane {
Clause c = selectedWord.getClause();
Sentence s = c.getSentence();
logger.info("Splitting sentence: " + s + " starting from word: " + selectedWord);
-
- s.getDocument().splitSentence(s, selectedWord);
+
+ s.getDocument().splitSentence(s, selectedWord);
reloadSentences();
diff --git a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/main/Styles.java b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/main/Styles.java
index 26ae5ce..1ba856a 100644
--- a/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clauseannotator/main/Styles.java
+++ b/ClauseAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clauseannotator/main/Styles.java
@@ -1,12 +1,11 @@
-package pl.waw.ipipan.zil.summarization.clauseannotator.main;
-
+package pl.waw.ipipan.zil.summarizer.clauseannotator.main;
import java.awt.Color;
import javax.swing.text.SimpleAttributeSet;
import javax.swing.text.StyleConstants;
-import pl.waw.ipipan.zil.summarization.clauseannotator.basic.Word;
+import pl.waw.ipipan.zil.summarizer.clauseannotator.basic.Word;
public class Styles {
diff --git a/ClauseAnnotator/src/main/java/log4j.properties b/ClauseAnnotator/src/main/resources/log4j.properties
index 0f9039c..6d8f00a 100644
--- a/ClauseAnnotator/src/main/java/log4j.properties
+++ b/ClauseAnnotator/src/main/resources/log4j.properties
@@ -2,4 +2,4 @@ log4j.appender.stderr=org.apache.log4j.ConsoleAppender
log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
log4j.appender.stderr.layout.ConversionPattern=[%p] [%C{1}] %m%n
-log4j.logger.pl.waw.ipipan.zil.summarization.clauseannotator=INFO, stderr
\ No newline at end of file
+log4j.logger.pl.waw.ipipan.zil=INFO, stderr
\ No newline at end of file
diff --git a/ClauseSumAnnotator/.classpath b/ClauseSumAnnotator/.classpath
deleted file mode 100644
index fc321d6..0000000
--- a/ClauseSumAnnotator/.classpath
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/ClauseSumAnnotator/.gitignore b/ClauseSumAnnotator/.gitignore
index 6b743b9..6cb1223 100644
--- a/ClauseSumAnnotator/.gitignore
+++ b/ClauseSumAnnotator/.gitignore
@@ -1,4 +1,4 @@
-*.class
-*~
-.settings/*
-target
+/target/
+.project
+.settings
+.classpath
diff --git a/ClauseSumAnnotator/pom.xml b/ClauseSumAnnotator/pom.xml
index 88f78a2..d0d5ec3 100644
--- a/ClauseSumAnnotator/pom.xml
+++ b/ClauseSumAnnotator/pom.xml
@@ -1,10 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>ipipan.atlas</groupId>
- <artifactId>sumannotator</artifactId>
- <version>0.1</version>
- <name>Sumannotator</name>
+ <groupId>pl.waw.ipipan.zil.summarizer</groupId>
+ <artifactId>clausesumannotator</artifactId>
+ <version>1.0</version>
+ <name>ClauseSumAnnotator</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
<build>
<plugins>
<plugin>
@@ -12,7 +15,7 @@
<configuration>
<archive>
<manifest>
- <mainClass>ipipan.atlas.sumannotator.main.Sumannotator</mainClass>
+ <mainClass>pl.waw.ipipan.zil.summarizer.clausesumannotator.main.ClauseSumAnnotator</mainClass>
</manifest>
</archive>
<descriptorRefs>
@@ -20,6 +23,14 @@
</descriptorRefs>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
diff --git a/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clausesumannotator/basic/Clause.java b/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clausesumannotator/basic/Clause.java
index cb9b295..56653fe 100644
--- a/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clausesumannotator/basic/Clause.java
+++ b/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clausesumannotator/basic/Clause.java
@@ -1,5 +1,4 @@
-package pl.waw.ipipan.zil.summarization.clausesumannotator.basic;
-
+package pl.waw.ipipan.zil.summarizer.clausesumannotator.basic;
import java.util.ArrayList;
import java.util.List;
diff --git a/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clausesumannotator/basic/Word.java b/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clausesumannotator/basic/Word.java
index 17417aa..c9580e7 100644
--- a/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clausesumannotator/basic/Word.java
+++ b/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clausesumannotator/basic/Word.java
@@ -1,4 +1,4 @@
-package pl.waw.ipipan.zil.summarization.clausesumannotator.basic;
+package pl.waw.ipipan.zil.summarizer.clausesumannotator.basic;
public class Word {
diff --git a/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clausesumannotator/io/SummaryFileIO.java b/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clausesumannotator/io/SummaryFileIO.java
index 9a2cdfd..3caf15b 100644
--- a/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clausesumannotator/io/SummaryFileIO.java
+++ b/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clausesumannotator/io/SummaryFileIO.java
@@ -1,5 +1,4 @@
-package pl.waw.ipipan.zil.summarization.clausesumannotator.io;
-
+package pl.waw.ipipan.zil.summarizer.clausesumannotator.io;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -15,8 +14,8 @@ import javax.swing.JTabbedPane;
import org.apache.log4j.Logger;
-import pl.waw.ipipan.zil.summarization.clausesumannotator.basic.Clause;
-import pl.waw.ipipan.zil.summarization.clausesumannotator.main.MyTab;
+import pl.waw.ipipan.zil.summarizer.clausesumannotator.basic.Clause;
+import pl.waw.ipipan.zil.summarizer.clausesumannotator.main.MyTab;
public class SummaryFileIO {
diff --git a/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clausesumannotator/io/XMLReader.java b/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clausesumannotator/io/XMLReader.java
index bcd8213..d32dcd9 100644
--- a/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clausesumannotator/io/XMLReader.java
+++ b/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clausesumannotator/io/XMLReader.java
@@ -1,5 +1,4 @@
-package pl.waw.ipipan.zil.summarization.clausesumannotator.io;
-
+package pl.waw.ipipan.zil.summarizer.clausesumannotator.io;
import java.io.File;
import java.io.FileInputStream;
@@ -12,8 +11,8 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.log4j.Logger;
import org.codehaus.stax2.XMLInputFactory2;
-import pl.waw.ipipan.zil.summarization.clausesumannotator.basic.Clause;
-import pl.waw.ipipan.zil.summarization.clausesumannotator.basic.Word;
+import pl.waw.ipipan.zil.summarizer.clausesumannotator.basic.Clause;
+import pl.waw.ipipan.zil.summarizer.clausesumannotator.basic.Word;
public class XMLReader {
@@ -46,10 +45,9 @@ public class XMLReader {
if (cont == null)
cont = "";
-
+
if (id == null) {
- error = "Clause without id in line: "
- + sr.getLocation().getLineNumber();
+ error = "Clause without id in line: " + sr.getLocation().getLineNumber();
break;
}
@@ -85,7 +83,7 @@ public class XMLReader {
}
if (currentClause == null) {
error = "Word not inside a clause in line: " + sr.getLocation().getLineNumber();
- break;
+ break;
}
currentClause.add(currentWord);
currentWord = null;
diff --git a/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clausesumannotator/main/ClauseSumAnnotator.java b/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clausesumannotator/main/ClauseSumAnnotator.java
index bc454a9..a5b7e64 100644
--- a/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clausesumannotator/main/ClauseSumAnnotator.java
+++ b/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clausesumannotator/main/ClauseSumAnnotator.java
@@ -1,5 +1,4 @@
-package pl.waw.ipipan.zil.summarization.clausesumannotator.main;
-
+package pl.waw.ipipan.zil.summarizer.clausesumannotator.main;
import java.awt.Cursor;
import java.awt.Dimension;
@@ -33,13 +32,13 @@ import javax.swing.filechooser.FileFilter;
import org.apache.log4j.Logger;
-import pl.waw.ipipan.zil.summarization.clausesumannotator.basic.Clause;
-import pl.waw.ipipan.zil.summarization.clausesumannotator.io.SummaryFileIO;
-import pl.waw.ipipan.zil.summarization.clausesumannotator.io.XMLReader;
+import pl.waw.ipipan.zil.summarizer.clausesumannotator.basic.Clause;
+import pl.waw.ipipan.zil.summarizer.clausesumannotator.io.SummaryFileIO;
+import pl.waw.ipipan.zil.summarizer.clausesumannotator.io.XMLReader;
public class ClauseSumAnnotator extends JFrame implements Runnable, MyTabChangeListener {
- private static final String WINDOW_TITLE = "Extraction summary creator";
+ private static final String WINDOW_TITLE = "Clause-extraction summary annotator";
private static final long serialVersionUID = -3830790411182131318L;
@@ -59,7 +58,8 @@ public class ClauseSumAnnotator extends JFrame implements Runnable, MyTabChangeL
public static void main(String[] args) {
if (args.length != 0 && args.length != 1) {
- logger.error("Wrong usage! Should be: java -jar " + ClauseSumAnnotator.class.getSimpleName() + " [input file]");
+ logger.error("Wrong usage! Should be: java -jar " + ClauseSumAnnotator.class.getSimpleName()
+ + " [input file]");
return;
}
final ClauseSumAnnotator summanno = new ClauseSumAnnotator();
@@ -277,7 +277,7 @@ public class ClauseSumAnnotator extends JFrame implements Runnable, MyTabChangeL
return true;
int result = JOptionPane.showOptionDialog(this, "Do you want to save changes?", "Unsaved changes",
- JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null, null, null);
+ JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null, null, null);
if (result == JOptionPane.CANCEL_OPTION)
return false;
diff --git a/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clausesumannotator/main/ClauseTable.java b/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clausesumannotator/main/ClauseTable.java
index 9167866..15130e5 100644
--- a/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clausesumannotator/main/ClauseTable.java
+++ b/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clausesumannotator/main/ClauseTable.java
@@ -1,5 +1,4 @@
-package pl.waw.ipipan.zil.summarization.clausesumannotator.main;
-
+package pl.waw.ipipan.zil.summarizer.clausesumannotator.main;
import java.awt.Color;
import java.awt.Component;
@@ -18,7 +17,7 @@ import javax.swing.ListSelectionModel;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableCellRenderer;
-import pl.waw.ipipan.zil.summarization.clausesumannotator.basic.Clause;
+import pl.waw.ipipan.zil.summarizer.clausesumannotator.basic.Clause;
public class ClauseTable extends JTable implements MouseListener, KeyListener {
@@ -161,7 +160,7 @@ public class ClauseTable extends JTable implements MouseListener, KeyListener {
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected,
- boolean hasFocus, int row, int col) {
+ boolean hasFocus, int row, int col) {
String text = value.toString();
setLineWrap(true);
diff --git a/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clausesumannotator/main/MyTab.java b/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clausesumannotator/main/MyTab.java
index 5ee6918..e526090 100644
--- a/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clausesumannotator/main/MyTab.java
+++ b/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clausesumannotator/main/MyTab.java
@@ -1,5 +1,4 @@
-package pl.waw.ipipan.zil.summarization.clausesumannotator.main;
-
+package pl.waw.ipipan.zil.summarizer.clausesumannotator.main;
import java.awt.BorderLayout;
import java.awt.Dimension;
@@ -15,7 +14,7 @@ import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
import javax.swing.JTextArea;
-import pl.waw.ipipan.zil.summarization.clausesumannotator.basic.Clause;
+import pl.waw.ipipan.zil.summarizer.clausesumannotator.basic.Clause;
public class MyTab extends JSplitPane implements MyTabChangeListener {
@@ -104,7 +103,7 @@ public class MyTab extends JSplitPane implements MyTabChangeListener {
pb.setString(chosenWords + "/0 = -- %");
else
pb.setString(chosenWords + "/" + targetSegmentCount + " = " + (100 * chosenWords / targetSegmentCount)
- + "%");
+ + "%");
textArea.setText(sb.toString());
notifyAllListeners();
diff --git a/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clausesumannotator/main/MyTabChangeListener.java b/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clausesumannotator/main/MyTabChangeListener.java
index 283a535..008ba13 100644
--- a/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/clausesumannotator/main/MyTabChangeListener.java
+++ b/ClauseSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/clausesumannotator/main/MyTabChangeListener.java
@@ -1,9 +1,8 @@
-package pl.waw.ipipan.zil.summarization.clausesumannotator.main;
-
+package pl.waw.ipipan.zil.summarizer.clausesumannotator.main;
import java.util.List;
-import pl.waw.ipipan.zil.summarization.clausesumannotator.basic.Clause;
+import pl.waw.ipipan.zil.summarizer.clausesumannotator.basic.Clause;
public interface MyTabChangeListener {
diff --git a/ClauseSumAnnotator/src/main/java/log4j.properties b/ClauseSumAnnotator/src/main/resources/log4j.properties
index c397541..6d8f00a 100644
--- a/ClauseSumAnnotator/src/main/java/log4j.properties
+++ b/ClauseSumAnnotator/src/main/resources/log4j.properties
@@ -2,4 +2,4 @@ log4j.appender.stderr=org.apache.log4j.ConsoleAppender
log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
log4j.appender.stderr.layout.ConversionPattern=[%p] [%C{1}] %m%n
-log4j.logger.pl.waw.ipipan.zil.summarization.clausesumannotator=INFO, stderr
\ No newline at end of file
+log4j.logger.pl.waw.ipipan.zil=INFO, stderr
\ No newline at end of file
diff --git a/ExtrSumAnnotator/.classpath b/ExtrSumAnnotator/.classpath
deleted file mode 100644
index fc321d6..0000000
--- a/ExtrSumAnnotator/.classpath
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/ExtrSumAnnotator/.gitignore b/ExtrSumAnnotator/.gitignore
index 6b743b9..6cb1223 100644
--- a/ExtrSumAnnotator/.gitignore
+++ b/ExtrSumAnnotator/.gitignore
@@ -1,4 +1,4 @@
-*.class
-*~
-.settings/*
-target
+/target/
+.project
+.settings
+.classpath
diff --git a/ExtrSumAnnotator/pom.xml b/ExtrSumAnnotator/pom.xml
index 4e5acf8..682d229 100644
--- a/ExtrSumAnnotator/pom.xml
+++ b/ExtrSumAnnotator/pom.xml
@@ -1,10 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>ipipan.atlas</groupId>
+ <groupId>pl.waw.ipipan.zil.summarizer</groupId>
<artifactId>extrsumannotator</artifactId>
- <version>0.1</version>
+ <version>1.0</version>
<name>ExtrSumAnnotator</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
<build>
<plugins>
<plugin>
@@ -12,7 +15,7 @@
<configuration>
<archive>
<manifest>
- <mainClass>ipipan.atlas.extrsumannotator.main.ExtrSumAnnotator</mainClass>
+ <mainClass>pl.waw.ipipan.zil.summarizer.extrsumannotator.main.ExtrSumAnnotator</mainClass>
</manifest>
</archive>
<descriptorRefs>
@@ -20,6 +23,14 @@
</descriptorRefs>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.7</source>
+ <target>1.7</target>
+ </configuration>
+ </plugin>
</plugins>
</build>
<dependencies>
@@ -34,4 +45,4 @@
<version>3.1.1</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/extrsumannotator/basic/Text.java b/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/extrsumannotator/basic/Text.java
index e3bc98b..5336c55 100644
--- a/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/extrsumannotator/basic/Text.java
+++ b/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/extrsumannotator/basic/Text.java
@@ -1,4 +1,4 @@
-package pl.waw.ipipan.zil.summarization.extrsumannotator.basic;
+package pl.waw.ipipan.zil.summarizer.extrsumannotator.basic;
import java.util.List;
import java.util.SortedSet;
diff --git a/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/extrsumannotator/io/SummaryFileIO.java b/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/extrsumannotator/io/SummaryFileIO.java
index a87a9ad..3ee5ab3 100644
--- a/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/extrsumannotator/io/SummaryFileIO.java
+++ b/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/extrsumannotator/io/SummaryFileIO.java
@@ -1,5 +1,4 @@
-package pl.waw.ipipan.zil.summarization.extrsumannotator.io;
-
+package pl.waw.ipipan.zil.summarizer.extrsumannotator.io;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -17,8 +16,8 @@ import java.util.TreeSet;
import org.apache.log4j.Logger;
-import pl.waw.ipipan.zil.summarization.extrsumannotator.basic.Text;
-import pl.waw.ipipan.zil.summarization.extrsumannotator.main.ExtrSumAnnotator;
+import pl.waw.ipipan.zil.summarizer.extrsumannotator.basic.Text;
+import pl.waw.ipipan.zil.summarizer.extrsumannotator.main.ExtrSumAnnotator;
public class SummaryFileIO {
diff --git a/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/extrsumannotator/main/ExtrSumAnnotator.java b/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/extrsumannotator/main/ExtrSumAnnotator.java
index bba3303..3a67534 100644
--- a/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/extrsumannotator/main/ExtrSumAnnotator.java
+++ b/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/extrsumannotator/main/ExtrSumAnnotator.java
@@ -1,5 +1,4 @@
-package pl.waw.ipipan.zil.summarization.extrsumannotator.main;
-
+package pl.waw.ipipan.zil.summarizer.extrsumannotator.main;
import java.awt.Cursor;
import java.awt.Dimension;
@@ -38,12 +37,12 @@ import javax.swing.filechooser.FileFilter;
import org.apache.log4j.Logger;
-import pl.waw.ipipan.zil.summarization.extrsumannotator.basic.Text;
-import pl.waw.ipipan.zil.summarization.extrsumannotator.io.SummaryFileIO;
+import pl.waw.ipipan.zil.summarizer.extrsumannotator.basic.Text;
+import pl.waw.ipipan.zil.summarizer.extrsumannotator.io.SummaryFileIO;
public class ExtrSumAnnotator extends JFrame implements Runnable, MyTabChangeListener {
- private static final String WINDOW_TITLE = "ESE v0.9";
+ private static final String WINDOW_TITLE = "ESE v1.0";
private static final long serialVersionUID = -3830790411182131318L;
@@ -68,7 +67,7 @@ public class ExtrSumAnnotator extends JFrame implements Runnable, MyTabChangeLis
public static void main(String[] args) {
if (args.length != 0 && args.length != 1) {
logger.error("Wrong usage! Should be: java -jar " + ExtrSumAnnotator.class.getSimpleName()
- + " [input file]");
+ + " [input file]");
return;
}
final ExtrSumAnnotator summanno = new ExtrSumAnnotator();
@@ -275,7 +274,7 @@ public class ExtrSumAnnotator extends JFrame implements Runnable, MyTabChangeLis
return true;
int result = JOptionPane.showOptionDialog(this, "Do you want to save changes?", "Unsaved changes",
- JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null, null, null);
+ JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE, null, null, null);
if (result == JOptionPane.CANCEL_OPTION)
return false;
diff --git a/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/extrsumannotator/main/MyTab.java b/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/extrsumannotator/main/MyTab.java
index a4d84e0..eb92e8b 100644
--- a/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/extrsumannotator/main/MyTab.java
+++ b/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/extrsumannotator/main/MyTab.java
@@ -1,5 +1,4 @@
-package pl.waw.ipipan.zil.summarization.extrsumannotator.main;
-
+package pl.waw.ipipan.zil.summarizer.extrsumannotator.main;
import java.awt.BorderLayout;
import java.awt.Color;
@@ -34,7 +33,7 @@ import javax.swing.text.Highlighter.HighlightPainter;
import org.apache.log4j.Logger;
-import pl.waw.ipipan.zil.summarization.extrsumannotator.basic.Text;
+import pl.waw.ipipan.zil.summarizer.extrsumannotator.basic.Text;
public class MyTab extends JSplitPane implements MyTabChangeListener {
@@ -84,7 +83,7 @@ public class MyTab extends JSplitPane implements MyTabChangeListener {
UndoAction undoAction = new UndoAction();
this.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(
- KeyStroke.getKeyStroke(KeyEvent.VK_Z, KeyEvent.CTRL_MASK), "undo");
+ KeyStroke.getKeyStroke(KeyEvent.VK_Z, KeyEvent.CTRL_MASK), "undo");
this.getActionMap().put("undo", undoAction);
undoButton = new JButton(undoAction);
undoButton.setEnabled(false);
diff --git a/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/extrsumannotator/main/MyTabChangeListener.java b/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/extrsumannotator/main/MyTabChangeListener.java
index c0bb108..6e5f031 100644
--- a/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarization/extrsumannotator/main/MyTabChangeListener.java
+++ b/ExtrSumAnnotator/src/main/java/pl/waw/ipipan/zil/summarizer/extrsumannotator/main/MyTabChangeListener.java
@@ -1,4 +1,4 @@
-package pl.waw.ipipan.zil.summarization.extrsumannotator.main;
+package pl.waw.ipipan.zil.summarizer.extrsumannotator.main;
import java.util.SortedSet;
diff --git a/ExtrSumAnnotator/src/main/java/log4j.properties b/ExtrSumAnnotator/src/main/resources/log4j.properties
index 2258654..6d8f00a 100644
--- a/ExtrSumAnnotator/src/main/java/log4j.properties
+++ b/ExtrSumAnnotator/src/main/resources/log4j.properties
@@ -2,4 +2,4 @@ log4j.appender.stderr=org.apache.log4j.ConsoleAppender
log4j.appender.stderr.layout=org.apache.log4j.PatternLayout
log4j.appender.stderr.layout.ConversionPattern=[%p] [%C{1}] %m%n
-log4j.logger.pl.waw.ipipan.zil.summarization.extrsumannotator=INFO, stderr
\ No newline at end of file
+log4j.logger.pl.waw.ipipan.zil=INFO, stderr
\ No newline at end of file