diff options
Diffstat (limited to 'scripting/java/org/openoffice/netbeans/modules/office')
12 files changed, 37 insertions, 38 deletions
diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java index e7da54240c71..015c15cfb54b 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/DeployParcelAction.java @@ -85,7 +85,7 @@ public class DeployParcelAction extends CookieAction implements Presenter.Popup if (!langdir.exists()) { boolean response = askIfCreateDirectory(langdir); - if (response == false) { + if (!response) { return; } } @@ -141,7 +141,7 @@ public class DeployParcelAction extends CookieAction implements Presenter.Popup public void run() { boolean result = parcelCookie.deploy(target); - if (result == true && target.isDirectory()) { + if (result && target.isDirectory()) { showNagDialog(); } } @@ -167,7 +167,7 @@ public class DeployParcelAction extends CookieAction implements Presenter.Popup result = false; } - if (result == false) { + if (!result) { String tmp = "Error creating: " + directory.getAbsolutePath(); NotifyDescriptor d2 = new NotifyDescriptor.Message( tmp, NotifyDescriptor.ERROR_MESSAGE); @@ -190,13 +190,13 @@ public class DeployParcelAction extends CookieAction implements Presenter.Popup OfficeSettings settings = OfficeSettings.getDefault(); - if (settings.getWarnAfterDirDeploy() == true) { + if (settings.getWarnAfterDirDeploy()) { NagDialog warning = NagDialog.createInformationDialog( message, "Show this message in future", true); warning.show(); - if (warning.getState() == false) + if (!warning.getState()) settings.setWarnAfterDirDeploy(false); } } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java index b8fe3e6226e4..bf310bc8b2c0 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelFolderSupport.java @@ -131,7 +131,7 @@ public class ParcelFolderSupport implements ParcelFolderCookie parcelBase.getName() + "." + ParcelZipper.PARCEL_EXTENSION); boolean proceed = configure(); - if (proceed == false) { + if (!proceed) { return; } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java index a019622dbe2c..2cfd316cddde 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/actions/ParcelSupport.java @@ -96,16 +96,16 @@ public class ParcelSupport implements ParcelCookie "Office, please close it before continuing. Click OK to " + "continue deployment."; - if (settings.getWarnBeforeDocDeploy() == true) { + if (settings.getWarnBeforeDocDeploy()) { NagDialog warning = NagDialog.createConfirmationDialog( message, "Show this message in future", true); boolean result = warning.show(); - if (warning.getState() == false) + if (!warning.getState()) settings.setWarnBeforeDocDeploy(false); - if (result == false) + if (!result) return false; } } @@ -114,8 +114,8 @@ public class ParcelSupport implements ParcelCookie getOutputWindowWriter(fo.getName() + " (deploying)"); try { - if (zipper.isOverwriteNeeded(source, target) == true) - if (promptForOverwrite(source, target) == false) + if (!zipper.isOverwriteNeeded(source, target)) + if (!promptForOverwrite(source, target)) return false; } catch (IOException ioe) { diff --git a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java index 1a73873cb243..4ec771869fb5 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/filesystem/OpenOfficeDocFileSystem.java @@ -166,7 +166,7 @@ public class OpenOfficeDocFileSystem throws java.beans.PropertyVetoException, java.io.IOException { System.out.println("OpenOfficeDocFileSystem.setDocument: file=\"" + file.toString() + "\""); - if((file.exists() == false) || (file.isFile() == false)) { + if(!file.exists() || !file.isFile()) { IOException ioe = new IOException( file.toString() + " does not exist"); ErrorManager.getDefault().annotate(ioe, NbBundle.getMessage( @@ -372,8 +372,7 @@ System.out.println(" exception: " + ioe.getMessage()); synchronized(cache) { ModifiedStrategy modifiedStrategy = new ModifiedStrategy(); scanDocument(modifiedStrategy); - if((isModified == true) || - (modifiedStrategy.isModified() == true)) + if(isModified || modifiedStrategy.isModified()) { File tmpFile = null; try { @@ -448,7 +447,7 @@ System.out.println(" exception: " + ioe.getMessage()); ZipEntry zEntry = new ZipEntry(name); zEntry.setTime(new Date().getTime()); cEntry = new Entry(zEntry); - if(editableStrategy.evaluate(cEntry) == false) { + if(!editableStrategy.evaluate(cEntry)) { throw new IOException( "cannot create/edit readonly file"); // I18N } @@ -478,7 +477,7 @@ System.out.println(" exception: " + ioe.getMessage()); zEntry.setCrc(crc.getValue()); zEntry.setTime(new Date().getTime()); cEntry = new Entry(zEntry); - if(editableStrategy.evaluate(cEntry) == false) { + if(!editableStrategy.evaluate(cEntry)) { throw new IOException( "cannot create folder"); // I18N } @@ -487,7 +486,7 @@ System.out.println(" exception: " + ioe.getMessage()); cache.put(cEntry.getName(), cEntry); isModified = true; } else { - if(cEntry.isFolder() == false) + if(!cEntry.isFolder()) cEntry = null; } } // synchronized @@ -669,12 +668,12 @@ System.out.println(" exception: " + ioe.getMessage()); throw new IOException( "there is no such a file/folder " + oldName); // I18N } - if(entry.isReadOnly() == true) { + if(entry.isReadOnly()) { throw new IOException( "file/folder " + oldName + " is readonly"); // I18N } entry.rename(nname); - if(editableStrategy.evaluate(entry) == false) { + if(!editableStrategy.evaluate(entry)) { entry.rename(oname); throw new IOException( "cannot create file/folder"); // I18N @@ -833,7 +832,7 @@ System.out.println(" exception: " + ioe.getMessage()); { // do not accept "children" of a file // ignore "read only" part of the filesystem - if(entry.isReadOnly() == false) { + if(!entry.isReadOnly()) { // identify a child if( (entry.getName().length() > 0) && (entry.getName().startsWith(parent))) @@ -972,7 +971,7 @@ System.out.println(" exception: " + ioe.getMessage()); size = entry.getSize(); time = entry.getTime(); // removes tail file separator from a folder name - if((folder == true) && (name.endsWith(SEPARATOR))) { + if(folder && name.endsWith(SEPARATOR)) { name = name.substring( 0, name.length() - SEPARATOR.length()); } @@ -1019,7 +1018,7 @@ System.out.println(" exception: " + ioe.getMessage()); public InputStream getInputStream() throws FileNotFoundException { - return (isFolder() == false)? new FileInputStream(getFile()): null; + return !isFolder() ? new FileInputStream(getFile()) : null; } public OutputStream getOutputStream() @@ -1053,7 +1052,7 @@ System.out.println(" exception: " + ioe.getMessage()); arch.putNextEntry(entry); } else { // file - if(isModified() == false) + if(!isModified()) entry.setTime(getTime()); else entry.setTime(node.lastModified()); @@ -1171,7 +1170,7 @@ System.out.println(" exception: " + ioe.getMessage()); throws IOException { modified = true; - return (isFolder() == false)? new FileOutputStream(getFile()): null; + return !isFolder() ? new FileOutputStream(getFile()) : null; } } } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java index 968173dcefc1..d47481ec39d5 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/OfficeDocumentDataLoader.java @@ -59,7 +59,7 @@ public class OfficeDocumentDataLoader extends UniFileLoader { protected FileObject findPrimaryFile(FileObject fo) { ExtensionList extensions = getExtensions(); - if (extensions.isRegistered(fo) == false) + if (!extensions.isRegistered(fo)) return null; File document = FileUtil.toFile(fo); diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java index ced430b451ea..4406f3f903c8 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelContentsFolderDataLoader.java @@ -45,8 +45,8 @@ public class ParcelContentsFolderDataLoader extends UniFileLoader { } protected FileObject findPrimaryFile(FileObject fo) { - if (fo.isFolder() == false || - fo.getName().equals(ParcelZipper.CONTENTS_DIRNAME) == false || + if (!fo.isFolder() || + !fo.getName().equals(ParcelZipper.CONTENTS_DIRNAME) || fo.getFileObject(ParcelZipper.PARCEL_DESCRIPTOR_XML) == null) return null; diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java index a6634a28a948..5865f32c2803 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDataNode.java @@ -66,7 +66,7 @@ public class ParcelDataNode extends DataNode { (ParcelCookie)sourceParcel.getCookie(ParcelCookie.class); parcelCookie.deploy(targetDocument); - if (isCut == true) { + if (isCut) { FileObject fo = sourceParcel.getDataObject().getPrimaryFile(); try { fo.delete(); diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java index bf392a4ecd39..c344830b1c27 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelDescriptorDataObject.java @@ -46,7 +46,7 @@ public class ParcelDescriptorDataObject extends MultiDataObject { CookieSet cookies = getCookieSet(); cookies.add(new ParcelDescriptorEditorSupport(this)); - if (canParse == true) + if (canParse) cookies.add(new ParcelDescriptorParserSupport(getPrimaryFile())); } @@ -55,7 +55,7 @@ public class ParcelDescriptorDataObject extends MultiDataObject { } protected Node createNodeDelegate() { - if (canParse == true) + if (canParse) return new ParcelDescriptorDataNode(this); else return new ParcelDescriptorDataNode(this, Children.LEAF); diff --git a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java index 3b435fe5b17d..df60b27561c1 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/loader/ParcelFolderDataLoader.java @@ -52,7 +52,7 @@ public class ParcelFolderDataLoader extends UniFileLoader { } protected FileObject findPrimaryFile(FileObject fo) { - if (fo.isFolder() == false) + if (!fo.isFolder()) return null; FileObject contents = fo.getFileObject(ParcelZipper.CONTENTS_DIRNAME); diff --git a/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java b/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java index c65a00f33f5d..e5b0e900162b 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/nodes/OfficeDocumentChildren.java @@ -48,7 +48,7 @@ public class OfficeDocumentChildren extends Children.Keys } Enumeration parcels = document.getParcels(); - if (parcels.hasMoreElements() != true) { + if (!parcels.hasMoreElements()) { setKeys(Collections.EMPTY_SET); return; } @@ -119,16 +119,16 @@ public class OfficeDocumentChildren extends Children.Keys "Office, please close it before continuing. Click OK to " + "delete this parcel."; - if (settings.getWarnBeforeParcelDelete() == true) { + if (settings.getWarnBeforeParcelDelete()) { NagDialog warning = NagDialog.createConfirmationDialog( message, "Show this message in future", true); boolean result = warning.show(); - if (warning.getState() == false) + if (!warning.getState()) settings.setWarnBeforeParcelDelete(false); - if (result == false) + if (!result) return; } super.destroy(); diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java index de74e8b181d3..b26b729455bf 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/FrameworkJarChecker.java @@ -111,7 +111,7 @@ public class FrameworkJarChecker { private static void warnBeforeMount() { OfficeSettings settings = OfficeSettings.getDefault(); - if (settings.getWarnBeforeMount() == false) + if (!settings.getWarnBeforeMount()) return; String message = "The Office Scripting Framework support jar file " + @@ -123,7 +123,7 @@ public class FrameworkJarChecker { NagDialog warning = NagDialog.createInformationDialog( message, prompt, true); - if (warning.getState() == false) { + if (!warning.getState()) { settings.setWarnBeforeMount(false); } } diff --git a/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java b/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java index 260b83bac0fb..270b30fde9d9 100644 --- a/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java +++ b/scripting/java/org/openoffice/netbeans/modules/office/utils/PackageRemover.java @@ -62,7 +62,7 @@ public class PackageRemover { } } - if (source.delete() == false) { + if (!source.delete()) { tmp.delete(); throw new IOException("Could not overwrite " + source); } |