updated API.

JavaSaBr · JavaSaBr · commit 74bfd7e78886 · 2017-08-31T11:08:35.000+03:00
diff --git a/src/main/java/com/ss/editor/file/converter/impl/AbstractFileConverter.java b/src/main/java/com/ss/editor/file/converter/impl/AbstractFileConverter.java
@@ -18,6 +18,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
@@ -119,7 +120,8 @@ public void convert(@NotNull final Path source, @NotNull final Path destination)
      * @param destination the target file.
      * @param overwrite   is need to overwrite.
      */
-    protected void convertImpl(@NotNull final Path source, @NotNull final Path destination, final boolean overwrite) {
+    protected void convertImpl(@NotNull final Path source, @NotNull final Path destination, final boolean overwrite)
+            throws IOException {
     }
 
     /**
diff --git a/src/main/java/com/ss/editor/file/converter/impl/AbstractModelFileConverter.java b/src/main/java/com/ss/editor/file/converter/impl/AbstractModelFileConverter.java
@@ -76,7 +76,7 @@ private void convert(@NotNull final Path source, @NotNull final ModelConverterDi
      * Convert a file using settings from the dialog.
      */
     @BackgroundThread
-    private void convertImpl(@NotNull final Path source, @NotNull final ModelConverterDialog dialog) {
+    private void convertImpl(@NotNull final Path source, @NotNull final ModelConverterDialog dialog) throws IOException {
 
         final String filename = dialog.getFilename();
         final Path destinationFolder = dialog.getDestinationFolder();
@@ -110,8 +110,6 @@ private void convertImpl(@NotNull final Path source, @NotNull final ModelConvert
 
         try (final OutputStream out = Files.newOutputStream(destination, WRITE, TRUNCATE_EXISTING, CREATE)) {
             exporter.save(model, out);
-        } catch (final IOException e) {
-            LOGGER.warning(this, e);
         }
 
         if (isOverwrite) {
diff --git a/src/main/java/com/ss/editor/plugin/api/file/creator/GenericFileCreator.java b/src/main/java/com/ss/editor/plugin/api/file/creator/GenericFileCreator.java
@@ -17,6 +17,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.IOException;
 import java.nio.file.Path;
 
 /**
@@ -95,7 +96,7 @@ protected boolean validate(@NotNull final VarTable vars) {
 
     @Override
     @BackgroundThread
-    protected void writeData(@NotNull final Path resultFile) {
+    protected void writeData(@NotNull final Path resultFile) throws IOException {
         writeData(getVars(), resultFile);
     }
 
@@ -106,7 +107,7 @@ protected void writeData(@NotNull final Path resultFile) {
      * @param resultFile the result file.
      */
     @BackgroundThread
-    protected void writeData(@NotNull final VarTable vars, @NotNull final Path resultFile) {
+    protected void writeData(@NotNull final VarTable vars, @NotNull final Path resultFile) throws IOException {
     }
 
     @FromAnyThread
diff --git a/src/main/java/com/ss/editor/ui/component/creator/impl/AbstractFileCreator.java b/src/main/java/com/ss/editor/ui/component/creator/impl/AbstractFileCreator.java
@@ -230,7 +230,6 @@ protected void processOk() {
             try {
 
                 writeData(tempFile);
-
                 try {
                     Files.move(tempFile, fileToCreate, REPLACE_EXISTING, ATOMIC_MOVE);
                 } catch (final AtomicMoveNotSupportedException ex) {
@@ -254,7 +253,7 @@ protected void processOk() {
      * @param resultFile the result file.
      */
     @BackgroundThread
-    protected void writeData(@NotNull final Path resultFile) {
+    protected void writeData(@NotNull final Path resultFile) throws IOException {
     }
 
     @Override
diff --git a/src/main/java/com/ss/editor/ui/component/creator/impl/EmptyModelCreator.java b/src/main/java/com/ss/editor/ui/component/creator/impl/EmptyModelCreator.java
@@ -48,16 +48,14 @@ protected String getFileExtension() {
 
     @Override
     @BackgroundThread
-    protected void writeData(@NotNull final Path resultFile) {
+    protected void writeData(@NotNull final Path resultFile) throws IOException {
         super.writeData(resultFile);
 
         final BinaryExporter exporter = BinaryExporter.getInstance();
         final Node newNode = new Node("Model root");
 
         try (final OutputStream out = Files.newOutputStream(resultFile, WRITE, TRUNCATE_EXISTING, CREATE)) {
             exporter.save(newNode, out);
-        } catch (final IOException e) {
-            LOGGER.warning(this, e);
         }
     }
 }
diff --git a/src/main/java/com/ss/editor/ui/component/creator/impl/EmptySceneCreator.java b/src/main/java/com/ss/editor/ui/component/creator/impl/EmptySceneCreator.java
@@ -49,16 +49,14 @@ protected String getFileExtension() {
 
     @Override
     @BackgroundThread
-    protected void writeData(@NotNull final Path resultFile) {
+    protected void writeData(@NotNull final Path resultFile) throws IOException {
         super.writeData(resultFile);
 
         final BinaryExporter exporter = BinaryExporter.getInstance();
         final SceneNode newNode = createScene();
 
         try (final OutputStream out = Files.newOutputStream(resultFile, WRITE, TRUNCATE_EXISTING, CREATE)) {
             exporter.save(newNode, out);
-        } catch (final IOException e) {
-            LOGGER.warning(this, e);
         }
     }
 
diff --git a/src/main/java/com/ss/editor/ui/component/creator/impl/material/MaterialFileCreator.java b/src/main/java/com/ss/editor/ui/component/creator/impl/material/MaterialFileCreator.java
@@ -2,9 +2,7 @@
 
 import static com.ss.editor.FileExtensions.JME_MATERIAL;
 import static com.ss.rlib.util.ObjectUtils.notNull;
-import static java.nio.file.StandardOpenOption.CREATE;
-import static java.nio.file.StandardOpenOption.TRUNCATE_EXISTING;
-import static java.nio.file.StandardOpenOption.WRITE;
+import static java.nio.file.StandardOpenOption.*;
 import com.jme3.asset.AssetManager;
 import com.jme3.material.Material;
 import com.ss.editor.Messages;
@@ -17,7 +15,6 @@
 import com.ss.editor.plugin.api.property.PropertyDefinition;
 import com.ss.editor.serializer.MaterialSerializer;
 import com.ss.editor.ui.component.creator.FileCreatorDescription;
-import com.ss.editor.util.EditorUtil;
 import com.ss.rlib.util.StringUtils;
 import com.ss.rlib.util.VarTable;
 import com.ss.rlib.util.array.Array;
@@ -125,7 +122,7 @@ protected boolean validate(@NotNull final VarTable vars) {
 
     @Override
     @BackgroundThread
-    protected void writeData(@NotNull final VarTable vars, @NotNull final Path resultFile) {
+    protected void writeData(@NotNull final VarTable vars, @NotNull final Path resultFile) throws IOException {
         super.writeData(vars, resultFile);
 
         final AssetManager assetManager = EDITOR.getAssetManager();
@@ -138,8 +135,6 @@ protected void writeData(@NotNull final VarTable vars, @NotNull final Path resul
 
         try (final PrintWriter out = new PrintWriter(Files.newOutputStream(resultFile, WRITE, TRUNCATE_EXISTING, CREATE))) {
             out.print(materialContent);
-        } catch (final IOException e) {
-            EditorUtil.handleException(LOGGER, this, e);
         }
     }
 }
diff --git a/src/main/java/com/ss/editor/ui/component/creator/impl/texture/SingleColorTextureFileCreator.java b/src/main/java/com/ss/editor/ui/component/creator/impl/texture/SingleColorTextureFileCreator.java
@@ -140,7 +140,7 @@ protected boolean validate(@NotNull final VarTable vars) {
 
     @Override
     @BackgroundThread
-    protected void writeData(@NotNull final VarTable vars, final @NotNull Path resultFile) {
+    protected void writeData(@NotNull final VarTable vars, final @NotNull Path resultFile) throws IOException {
         super.writeData(vars, resultFile);
 
         final Color color = UIUtils.from(vars.get(PROP_COLOR, ColorRGBA.class));
@@ -161,8 +161,6 @@ protected void writeData(@NotNull final VarTable vars, final @NotNull Path resul
 
         try (final OutputStream out = Files.newOutputStream(resultFile)) {
             ImageIO.write(bufferedImage, "png", out);
-        } catch (final IOException e) {
-            throw new RuntimeException(e);
         }
     }
 }
diff --git a/src/main/java/com/ss/editor/ui/component/editor/impl/AbstractFileEditor.java b/src/main/java/com/ss/editor/ui/component/editor/impl/AbstractFileEditor.java
@@ -394,7 +394,7 @@ public void save(@Nullable final Consumer<@NotNull FileEditor> callback) {
      * @param toStore the file to store.
      */
     @BackgroundThread
-    protected void doSave(@NotNull final Path toStore) {
+    protected void doSave(@NotNull final Path toStore) throws IOException {
     }
 
     /**
diff --git a/src/main/java/com/ss/editor/ui/component/editor/impl/CodeAreaFileEditor.java b/src/main/java/com/ss/editor/ui/component/editor/impl/CodeAreaFileEditor.java
@@ -126,16 +126,14 @@ private void setOriginalContent(@NotNull final String originalContent) {
 
     @Override
     @BackgroundThread
-    public void doSave(@NotNull final Path toStore) {
+    public void doSave(@NotNull final Path toStore) throws IOException {
         super.doSave(toStore);
 
         final CodeArea codeArea = getCodeArea();
         final String newContent = codeArea.getText();
 
         try (final PrintWriter out = new PrintWriter(Files.newOutputStream(toStore))) {
             out.print(newContent);
-        } catch (final IOException e) {
-            LOGGER.warning(this, e);
         }
     }
 
diff --git a/src/main/java/com/ss/editor/ui/component/editor/impl/TextFileEditor.java b/src/main/java/com/ss/editor/ui/component/editor/impl/TextFileEditor.java
@@ -124,16 +124,14 @@ private void setOriginalContent(@NotNull final String originalContent) {
 
     @Override
     @BackgroundThread
-    public void doSave(@NotNull final Path toStore) {
+    public void doSave(@NotNull final Path toStore) throws IOException {
         super.doSave(toStore);
 
         final TextArea textArea = getTextArea();
         final String newContent = textArea.getText();
 
         try (final PrintWriter out = new PrintWriter(Files.newOutputStream(toStore))) {
             out.print(newContent);
-        } catch (final IOException e) {
-            LOGGER.warning(this, e);
         }
     }
 
diff --git a/src/main/java/com/ss/editor/ui/component/editor/impl/material/MaterialFileEditor.java b/src/main/java/com/ss/editor/ui/component/editor/impl/material/MaterialFileEditor.java
@@ -185,16 +185,14 @@ protected void processChangedFile(@NotNull final FileChangedEvent event) {
 
     @Override
     @BackgroundThread
-    public void doSave(@NotNull final Path toStore) {
+    public void doSave(@NotNull final Path toStore) throws IOException {
         super.doSave(toStore);
 
         final Material currentMaterial = getCurrentMaterial();
         final String content = MaterialSerializer.serializeToString(currentMaterial);
 
         try (final PrintWriter out = new PrintWriter(Files.newOutputStream(toStore))) {
             out.print(content);
-        } catch (final IOException e) {
-            LOGGER.warning(this, e);
         }
     }
 
diff --git a/src/main/java/com/ss/editor/ui/component/editor/impl/scene/AbstractSceneFileEditor.java b/src/main/java/com/ss/editor/ui/component/editor/impl/scene/AbstractSceneFileEditor.java
@@ -760,7 +760,7 @@ protected void updateSelection(@Nullable final Spatial spatial) {
 
     @Override
     @BackgroundThread
-    public void doSave(@NotNull final Path toStore) {
+    public void doSave(@NotNull final Path toStore) throws IOException {
         super.doSave(toStore);
 
         final M currentModel = getCurrentModel();
@@ -771,8 +771,6 @@ public void doSave(@NotNull final Path toStore) {
 
         try (final OutputStream out = Files.newOutputStream(toStore)) {
             exporter.save(currentModel, out);
-        } catch (final IOException e) {
-            LOGGER.warning(this, e);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -48,16 +48,14 @@ protected String getFileExtension() {`
`48`	`48`
`49`	`49`	`@Override`
`50`	`50`	`@BackgroundThread`
`51`		`- protected void writeData(@NotNull final Path resultFile) {`
	`51`	`+ protected void writeData(@NotNull final Path resultFile) throws IOException {`
`52`	`52`	`super.writeData(resultFile);`
`53`	`53`
`54`	`54`	`final BinaryExporter exporter = BinaryExporter.getInstance();`
`55`	`55`	`final Node newNode = new Node("Model root");`
`56`	`56`
`57`	`57`	`try (final OutputStream out = Files.newOutputStream(resultFile, WRITE, TRUNCATE_EXISTING, CREATE)) {`
`58`	`58`	`exporter.save(newNode, out);`
`59`		`- } catch (final IOException e) {`
`60`		`- LOGGER.warning(this, e);`
`61`	`59`	`}`
`62`	`60`	`}`
`63`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,16 +49,14 @@ protected String getFileExtension() {`
`49`	`49`
`50`	`50`	`@Override`
`51`	`51`	`@BackgroundThread`
`52`		`- protected void writeData(@NotNull final Path resultFile) {`
	`52`	`+ protected void writeData(@NotNull final Path resultFile) throws IOException {`
`53`	`53`	`super.writeData(resultFile);`
`54`	`54`
`55`	`55`	`final BinaryExporter exporter = BinaryExporter.getInstance();`
`56`	`56`	`final SceneNode newNode = createScene();`
`57`	`57`
`58`	`58`	`try (final OutputStream out = Files.newOutputStream(resultFile, WRITE, TRUNCATE_EXISTING, CREATE)) {`
`59`	`59`	`exporter.save(newNode, out);`
`60`		`- } catch (final IOException e) {`
`61`		`- LOGGER.warning(this, e);`
`62`	`60`	`}`
`63`	`61`	`}`
`64`	`62`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ protected boolean validate(@NotNull final VarTable vars) {`
`140`	`140`
`141`	`141`	`@Override`
`142`	`142`	`@BackgroundThread`
`143`		`- protected void writeData(@NotNull final VarTable vars, final @NotNull Path resultFile) {`
	`143`	`+ protected void writeData(@NotNull final VarTable vars, final @NotNull Path resultFile) throws IOException {`
`144`	`144`	`super.writeData(vars, resultFile);`
`145`	`145`
`146`	`146`	`final Color color = UIUtils.from(vars.get(PROP_COLOR, ColorRGBA.class));`
`@@ -161,8 +161,6 @@ protected void writeData(@NotNull final VarTable vars, final @NotNull Path resul`
`161`	`161`
`162`	`162`	`try (final OutputStream out = Files.newOutputStream(resultFile)) {`
`163`	`163`	`ImageIO.write(bufferedImage, "png", out);`
`164`		`- } catch (final IOException e) {`
`165`		`- throw new RuntimeException(e);`
`166`	`164`	`}`
`167`	`165`	`}`
`168`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -394,7 +394,7 @@ public void save(@Nullable final Consumer<@NotNull FileEditor> callback) {`
`394`	`394`	`* @param toStore the file to store.`
`395`	`395`	`*/`
`396`	`396`	`@BackgroundThread`
`397`		`- protected void doSave(@NotNull final Path toStore) {`
	`397`	`+ protected void doSave(@NotNull final Path toStore) throws IOException {`
`398`	`398`	`}`
`399`	`399`
`400`	`400`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -126,16 +126,14 @@ private void setOriginalContent(@NotNull final String originalContent) {`
`126`	`126`
`127`	`127`	`@Override`
`128`	`128`	`@BackgroundThread`
`129`		`- public void doSave(@NotNull final Path toStore) {`
	`129`	`+ public void doSave(@NotNull final Path toStore) throws IOException {`
`130`	`130`	`super.doSave(toStore);`
`131`	`131`
`132`	`132`	`final CodeArea codeArea = getCodeArea();`
`133`	`133`	`final String newContent = codeArea.getText();`
`134`	`134`
`135`	`135`	`try (final PrintWriter out = new PrintWriter(Files.newOutputStream(toStore))) {`
`136`	`136`	`out.print(newContent);`
`137`		`- } catch (final IOException e) {`
`138`		`- LOGGER.warning(this, e);`
`139`	`137`	`}`
`140`	`138`	`}`
`141`	`139`