Changeset 85 for java/main/src/main/java/com/framsticks/parsers/FileSource.java

Timestamp:

06/24/13 13:38:40 (11 years ago)

Author:

psniegowski

Message:

HIGHLIGHTS:

• upgrade to Java 7
  • use try-multi-catch clauses
  • use try-with-resources were appropriate
• configure FindBugs? (use mvn site and then navigate in browser to the report)
  • remove most bugs found
• parametrize Dispatching environment (Dispatcher, RunAt?) to enforce more control on the place of closures actual call

CHANGELOG:
Rework FavouritesXMLFactory.

FindBugs?. Thread start.

FindBugs?. Minor change.

FindBugs?. Iterate over entrySet.

FindBugs?. Various.

FindBug?.

FindBug?. Encoding.

FindBug?. Final fields.

FindBug?.

Remove synchronization bug in ClientConnection?.

Experiments with findbugs.

Finish parametrization.

Make RunAt? an abstract class.

More changes in parametrization.

More changes in parametrizing dispatching.

Several changes to parametrize tasks.

Rename Runnable to RunAt?.

Add specific framsticks Runnable.

Add JSR305 (annotations).

Add findbugs reporting.

More improvements to ParamBuilder? wording.

Make FramsClass? accept also ParamBuilder?.

Change wording of ParamBuilder?.

Change wording of Request creation.

Use Java 7 exception catch syntax.

Add ScopeEnd? class.

Upgrade to Java 7.

File:

• java/main/src/main/java/com/framsticks/parsers/FileSource.java (modified) (5 diffs)

java/main/src/main/java/com/framsticks/parsers/FileSource.java

@@ -2 +2 @@
 
 import com.framsticks.params.SourceInterface;
+import com.framsticks.util.io.Encoding;
 
 import java.io.*;
@@ -8 +9 @@
 public class FileSource implements SourceInterface {
 
-        private BufferedReader reader;
-        private String filename;
-        
-        public FileSource(String filename) throws IOException
-        {
+        private final BufferedReader reader;
+        private final String filename;
+
+        protected FileSource(InputStream stream, String filename) {
                 this.filename = filename;
-        reader = new BufferedReader(new FileReader(filename));
+                this.reader = new BufferedReader(new InputStreamReader(stream, Encoding.getFramsticksCharset()));
+        }
+
+        public FileSource(String filename) throws IOException {
+                this(new FileInputStream(filename), filename);
         }
 
         public FileSource(InputStream stream) {
-                filename = "<stream>";
-                reader = new BufferedReader(new InputStreamReader(stream));
+                this(stream, "<stream>");
         }
 
-
-    @Override
-    public String readLine()
+        @Override
+        public String readLine()
         {
                 try
@@ -35 +37 @@
         }
 
-    @Override
-    public String getFilename()
+        @Override
+        public String getFilename()
         {
                 return filename;
         }
 
-    @Override
-    public String demangleInclude(String include)
+        @Override
+        public String demangleInclude(String include)
         {
                 if (!include.contains(java.io.File.separator)) {
@@ -52 +54 @@
                         }
                         include = currentFilePath + include;
-                }       
+                }
                 return include;
         }
 
-    @Override
-    public SourceInterface openInclude(String include)
+        @Override
+        public SourceInterface openInclude(String include)
         {
                 try
@@ -65 +67 @@
                 catch(IOException e)
                 {
-                        
+
                 }
                 return null;
         }
 
-    @Override
-    public void close()
+        @Override
+        public void close()
         {
                 try {
                         reader.close();
                 } catch (IOException e) {
-                        
+
                 }
         }
-        
+
 }