Changeset 504 for trunk/src/org/expeditee/io

Timestamp:

11/19/13 12:01:52 (11 years ago)

Author:

jts21

Message:

New copy/paste handling, add pdfImporter, add dictionary and documentation to resources, other small changes

Location:

trunk/src/org/expeditee/io

Files:

• ExpClipReader.java (added)
• ExpClipWriter.java (added)
• ExpReader.java (modified) (4 diffs)
• ExpWriter.java (modified) (5 diffs)
• ItemSelection.java (added)

trunk/src/org/expeditee/io/ExpReader.java

@@ -46 +46 @@
          * @return true if s begins with a tag
          */
-        private static boolean isValidLine(String s) {
+        protected static boolean isValidLine(String s) {
                 return s.length() >= 2 && s.charAt(1) == ' '
                                 && Character.isLetter(s.charAt(0));
@@ -184 +184 @@
          *            The line of text read in from the file to process.
          */
-        private void processBodyLine(Item item, String line) {
+        protected void processBodyLine(Item item, String line) {
                 // separate the tag from the value
                 Character tag = getTag(line);
@@ -203 +203 @@
         }
 
-        private static Character getTag(String line) {
+        protected static Character getTag(String line) {
                 assert (line.length() > 0);
                 return line.charAt(0);
         }
 
-        private static String getValue(String line) {
+        protected static String getValue(String line) {
                 if (line.length() > 2)
                         return line.substring(2);
@@ -250 +250 @@
 
         // Returns a point from a String containing two ints separated by a space
-        private java.awt.Point separateValues(String line) {
+        protected java.awt.Point separateValues(String line) {
                 int x = Integer.parseInt(line.substring(0, line.indexOf(" ")));
                 int y = Integer.parseInt(line.substring(line.indexOf(" ") + 1));

trunk/src/org/expeditee/io/ExpWriter.java

@@ -31 +31 @@
         private ProxyWriter _writer = null;
 
-        private StringBuilder _stringWriter = null;
+        protected StringBuilder _stringWriter = null;
 
         private static final char TERMINATOR = 'Z';
@@ -130 +130 @@
         }
 
-        private void writeTerminator() throws IOException {
+        protected void writeTerminator() throws IOException {
                 writeLine(TERMINATOR + "\n");
         }
 
         // writes the given line out to the file
-        private void writeLine(String line) throws IOException {
+        protected void writeLine(String line) throws IOException {
                 // do not write empty lines
                 if (line == null)
@@ -152 +152 @@
                         return;
 
+                writeItemAlways(item);
+        }
+        
+        protected void writeItemAlways(Item item) throws IOException {
                 if (item.isLineEnd())
                         writeLineEnd(item);
@@ -173 +177 @@
 
         // writes out all lines to the file
-        private void writeLineData() throws IOException {
+        protected void writeLineData() throws IOException {
                 List<Line> seen = new LinkedList<Line>();
 
@@ -206 +210 @@
 
         // writes out any constraints to the file
-        private void writeConstraintData() throws IOException {
+        protected void writeConstraintData() throws IOException {
                 // outputs any constraints the points have