diff options
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src')
5 files changed, 13 insertions, 6 deletions
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/compare/MergeEditorInput.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/compare/MergeEditorInput.java index 5358126ea..a804d50ff 100644 --- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/compare/MergeEditorInput.java +++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/compare/MergeEditorInput.java @@ -18,6 +18,7 @@ import org.eclipse.compare.IPropertyChangeNotifier; import org.eclipse.compare.structuremergeviewer.Differencer;
import org.eclipse.compare.structuremergeviewer.ICompareInput;
import org.eclipse.compare.structuremergeviewer.ICompareInputChangeListener;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.ISafeRunnable;
import org.eclipse.core.runtime.ListenerList;
@@ -279,7 +280,7 @@ public class MergeEditorInput extends CompareEditorInput implements */
public LocalFileSaveable getSaveable() {
if (saveable == null) {
- assert getCompareResult() != null;
+ Assert.isNotNull(getCompareResult());
saveable = new LocalFileSaveable(getCompareResult(), this, left);
}
return saveable;
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/FSTreeNodePropertyTester.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/FSTreeNodePropertyTester.java index 4e7ada41c..389fba2c7 100644 --- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/FSTreeNodePropertyTester.java +++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/FSTreeNodePropertyTester.java @@ -15,6 +15,7 @@ package org.eclipse.tm.te.tcf.filesystem.internal.handlers; import java.io.File;
import org.eclipse.core.expressions.PropertyTester;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.tm.te.tcf.filesystem.model.CacheState;
import org.eclipse.tm.te.tcf.filesystem.model.FSTreeNode;
@@ -32,7 +33,7 @@ public class FSTreeNodePropertyTester extends PropertyTester { */
@Override
public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
- assert receiver != null && receiver instanceof FSTreeNode;
+ Assert.isTrue(receiver instanceof FSTreeNode);
FSTreeNode node = (FSTreeNode) receiver;
if (property.equals("isFile")) { //$NON-NLS-1$
return node.isFile();
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/StateManager.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/StateManager.java index e43b4c7fd..90359ae20 100644 --- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/StateManager.java +++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/StateManager.java @@ -12,6 +12,7 @@ package org.eclipse.tm.te.tcf.filesystem.internal.handlers; import java.io.File;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.osgi.util.NLS;
import org.eclipse.tm.tcf.protocol.IChannel;
import org.eclipse.tm.tcf.protocol.IToken;
@@ -142,7 +143,7 @@ public class StateManager { node.attr = attr;
if (sync) {
File file = CacheManager.getInstance().getCacheFile(node);
- assert file.exists();
+ Assert.isTrue(file.exists());
file.setLastModified(attr.mtime);
CacheManager.getInstance().setBaseTimestamp(node.getLocationURL(), attr.mtime);
}
@@ -157,7 +158,7 @@ public class StateManager { */
public void commitState(final FSTreeNode node) throws TCFException {
File file = CacheManager.getInstance().getCacheFile(node);
- assert file.exists();
+ Assert.isTrue(file.exists());
long mtime = file.lastModified();
// Create the new file attribute based on the file's last modified time.
final IFileSystem.FileAttrs attrs = new IFileSystem.FileAttrs(node.attr.flags, node.attr.size, node.attr.uid, node.attr.gid, node.attr.permissions, node.attr.atime, mtime,
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/UserManager.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/UserManager.java index 826f1b20a..08f60d698 100644 --- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/UserManager.java +++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/handlers/UserManager.java @@ -10,6 +10,7 @@ *******************************************************************************/
package org.eclipse.tm.te.tcf.filesystem.internal.handlers;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.widgets.Shell;
@@ -152,7 +153,9 @@ public class UserManager { * The peer model to which the user account is saved.
*/
private void setUserToPeer(final IPeerModel peer, final UserAccount account) {
- assert peer != null && account != null;
+ Assert.isNotNull(peer);
+ Assert.isNotNull(account);
+
if (Protocol.isDispatchThread()) {
peer.setProperty(USER_ACCOUNT_KEY, account);
} else {
diff --git a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/properties/GeneralInformationPage.java b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/properties/GeneralInformationPage.java index fe9e43945..759b0f3b6 100644 --- a/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/properties/GeneralInformationPage.java +++ b/target_explorer/plugins/org.eclipse.tm.te.tcf.filesystem/src/org/eclipse/tm/te/tcf/filesystem/internal/properties/GeneralInformationPage.java @@ -13,6 +13,7 @@ import java.text.DateFormat; import java.text.DecimalFormat;
import java.util.Date;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
@@ -254,7 +255,7 @@ public class GeneralInformationPage extends PropertyPage { @Override
protected Control createContents(Composite parent) {
IAdaptable element = getElement();
- assert element != null && element instanceof FSTreeNode;
+ Assert.isTrue(element instanceof FSTreeNode);
FSTreeNode node = (FSTreeNode) element;
Composite page = new Composite(parent, SWT.NONE);
|