release 0.9.8

trol73 · Aug 3, 2016 · bc14c7d · bc14c7d
1 parent c7ef1b5
commit bc14c7d
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 16 deletions.
diff --git a/build.properties b/build.properties
@@ -22,7 +22,7 @@ app.name=trolCommander
 app.vendor=Oleg Trifonov
 
 # trolCommander version.
-app.version=0.9.7
+app.version=0.9.8
 
 # Fully qualified name of the class that starts trolCommander.
 app.main=com.mucommander.TrolCommander
@@ -73,12 +73,12 @@ store.pass=
 
 # Path to the NSIS installation dir.
 # If not set, Windows executables won't be generated.
-nsis.dir=/usr/local/Cellar/makensis/2.46/share/nsis
+nsis.dir=/usr/local/Cellar/makensis/2.50/share/nsis
 
 # Path to the NSIS executable file.
 # This will more often than not be ${nsis.dir}/makensis.
 # If not set, Windows executables won't be generated.
-nsis.bin=/usr/local/Cellar/makensis/2.46/bin/makensis
+nsis.bin=/usr/local/Cellar/makensis/2.50/bin/makensis
 
 # Path to the launch4j installation dir.
 # If not set, Windows executable won't be generated.

diff --git a/build.xml b/build.xml
@@ -1138,6 +1138,9 @@
                 <pathelement location="${tmp.main}"/>
                 <path refid="lib.runtime"/>
             </classpath>
+<!--            
+            <jvmarg value="-verbose"/>
+-->
         </java>
     </target>
 </project>
diff --git a/res/runtime/dictionary.properties b/res/runtime/dictionary.properties
@@ -313,6 +313,7 @@ ToggleStatusBar.show = Show status bar
 ToggleStatusBar.hide = Hide status bar
 ToggleShowFoldersFirst.label = Show folders first
 ToggleTree.label = Show tree view
+ToggleSinglePanel.label = Toggle single panel
 PopupLeftDriveButton.label = Change left folder
 PopupRightDriveButton.label = Change right folder
 RecallPreviousWindow.label = Recall previous window

diff --git a/res/runtime/dictionary_ru_RU.properties b/res/runtime/dictionary_ru_RU.properties
@@ -301,6 +301,7 @@ ToggleStatusBar.show = Показать панель статуса
 ToggleStatusBar.hide = Скрыть панель статуса
 ToggleShowFoldersFirst.label = Вынести каталоги в начало списка
 ToggleTree.label = Показать древовидный вид
+ToggleSinglePanel.label = Режим одной панели
 PopupLeftDriveButton.label = Изменить левый каталог
 PopupRightDriveButton.label = Изменить правый каталог
 RecallPreviousWindow.label = Переключиться в предыдущее окно

diff --git a/src/main/com/mucommander/job/TransferFileJob.java b/src/main/com/mucommander/job/TransferFileJob.java
@@ -127,6 +127,10 @@ protected void copyToReadonlyFile(AbstractFile sourceFile, AbstractFile destFile
     /**
      * Copies the given source file to the specified destination file, optionally resuming the operation.
      * As much as the source and destination protocols allow, the source file's date and permissions will be preserved.
+     *
+     * @param sourceFile source file
+     * @param destFile destination file
+     * @param append append or overwrite
      */
     protected void copyFile(AbstractFile sourceFile, AbstractFile destFile, boolean append) throws FileTransferException {
         // Reset this field in case it was set to true for the previous file
@@ -173,7 +177,7 @@ protected void copyFile(AbstractFile sourceFile, AbstractFile destFile, boolean
                         in = sourceFile.getInputStream();
                         if (integrityCheckEnabled) {
                             in = new ChecksumInputStream(in, MessageDigest.getInstance(CHECKSUM_VERIFICATION_ALGORITHM));
-                    }
+                        }
                     }
 
                     setCurrentInputStream(in);
@@ -239,11 +243,10 @@ protected void copyFile(AbstractFile sourceFile, AbstractFile destFile, boolean
 
         // This block is executed only if integrity check has been enabled (disabled by default)
         if (integrityCheckEnabled) {
-            String sourceChecksum;
-
             // Indicate that integrity is being checked, the value is reset when the next file starts
             isCheckingIntegrity = true;
 
+            String sourceChecksum;
             if (in != null && (in instanceof ChecksumInputStream)) {
                 // The file was copied with a ChecksumInputStream, the checksum is already calculated, simply
                 // retrieve it
@@ -346,7 +349,7 @@ protected boolean tryCopyFile(AbstractFile sourceFile, AbstractFile destFile, bo
                                 choice = showErrorDialog(errorDialogTitle, Translator.get("overwrite_readonly_file", destFile.getName()), actionTexts, actionValues);
                             }
                         } else {
-                        choice = showErrorDialog(errorDialogTitle, Translator.get("cannot_write_file", destFile.getName()));
+                            choice = showErrorDialog(errorDialogTitle, Translator.get("cannot_write_file", destFile.getName()));
                         }
                         break;
                     // Source and destination files are identical
@@ -471,7 +474,7 @@ public synchronized void skipCurrentFile() {
         // Resume job if currently paused 
         if (getState() == State.PAUSED) {
             setPaused(false);
-    }
+        }
     }
 
     /**
@@ -557,14 +560,14 @@ public ByteCounter getTotalSkippedByteCounter() {
     public void setThroughputLimit(long bytesPerSecond) {
         // Note: ThroughputInputStream interprets 0 as a complete pause (blocks reads) which is different
         // from what a user would expect when specifying 0 as a limit
-        this.throughputLimit = bytesPerSecond<=0?-1:bytesPerSecond;
+        this.throughputLimit = bytesPerSecond <= 0 ? -1 : bytesPerSecond;
 
         synchronized(this) {
             if (getState() != State.PAUSED && tlin != null) {
                 tlin.setThroughputLimit(throughputLimit);
+            }
         }
     }
-    }
 
     /**
      * Returns the current transfer throughput limit, in bytes per second. <code>0</code> or <code>-1</code> means that
@@ -607,7 +610,7 @@ protected void jobPaused() {
         super.jobPaused();
 
         synchronized(this) {
-            if(tlin !=null)
+            if (tlin != null)
                 tlin.setThroughputLimit(0);
         }
     }
@@ -625,9 +628,9 @@ protected void jobResumed() {
             // Restore previous throughput limit (if any, -1 by default)
             if (tlin != null) {
                 tlin.setThroughputLimit(throughputLimit);
+            }
         }
     }
-    }
 
 
     /**

diff --git a/src/main/com/mucommander/ui/viewer/FilePreloadWorker.java b/src/main/com/mucommander/ui/viewer/FilePreloadWorker.java
@@ -78,8 +78,8 @@ public void run() {
 
             }
             // read one byte to init reader (actual for avrdude-files, etc.)
-            is.read();
-            is.unread(1);
+            int b = is.read();
+            is.unread(b);
         } catch (Throwable e) {
             readException = e;
         }

diff --git a/src/main/com/mucommander/ui/viewer/ViewerRegistrar.java b/src/main/com/mucommander/ui/viewer/ViewerRegistrar.java
@@ -223,7 +223,6 @@ public static void createViewerFrame(MainFrame mainFrame, AbstractFile file, Ima
      * @throws UserCancelledException if the user has been asked to confirm the operation and canceled
      */
     public static FileViewer createFileViewer(AbstractFile file, ViewerFrame frame, ViewerFactory defaultFactory) throws UserCancelledException {
-System.out.println("create sync start");
     	FileViewer viewer = null;
         MainFrame mainFrame = frame != null ? frame.getMainFrame() : null;
         for (ViewerFactory factory : viewerFactories) {
@@ -241,7 +240,6 @@ public static FileViewer createFileViewer(AbstractFile file, ViewerFrame frame,
                     }
                     break;
                 }
-System.out.println("create sync finish");
             } catch (WarnUserException e) {
                 if (mainFrame != null) {
                     mainFrame.setCursor(Cursor.getDefaultCursor());