Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2019-12-13 19:06:44 +0000
committerEike Stepper2019-12-13 19:56:07 +0000
commit3057ec447b4764b8a6a9cc535e5bcc37c3e01479 (patch)
tree8859f70412e9dbc754294ec157b8c6a9f81dc40c /plugins/org.eclipse.emf.cdo.transfer/src
parent3960a2be32acacca909cdc5868d1a0f018c15827 (diff)
downloadcdo-3057ec447b4764b8a6a9cc535e5bcc37c3e01479.tar.gz
cdo-3057ec447b4764b8a6a9cc535e5bcc37c3e01479.tar.xz
cdo-3057ec447b4764b8a6a9cc535e5bcc37c3e01479.zip
[558310] [Releng] Update Bundle-RequiredExecutionEnvironment to JavaSE-1.8
https://bugs.eclipse.org/bugs/show_bug.cgi?id=558310
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.transfer/src')
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferMappingImpl.java23
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferType.java3
3 files changed, 31 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java
index 3470d803f9..f40dbea968 100644
--- a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java
+++ b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, 2016, 2018 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2012, 2015, 2016, 2018, 2019 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -86,21 +86,25 @@ public class CDOTransfer implements INotifier
this.targetSystem = targetSystem;
}
+ @Override
public void addListener(IListener listener)
{
notifier.addListener(listener);
}
+ @Override
public void removeListener(IListener listener)
{
notifier.removeListener(listener);
}
+ @Override
public boolean hasListeners()
{
return notifier.hasListeners();
}
+ @Override
public IListener[] getListeners()
{
return notifier.getListeners();
@@ -157,6 +161,7 @@ public class CDOTransfer implements INotifier
final Set<CDOTransferType> result = new HashSet<CDOTransferType>();
rootMapping.accept(new CDOTransferMapping.Visitor()
{
+ @Override
public boolean visit(CDOTransferMapping mapping)
{
result.add(mapping.getTransferType());
@@ -443,6 +448,7 @@ public class CDOTransfer implements INotifier
{
public static final PathProvider DEFAULT = new PathProvider()
{
+ @Override
public IPath getPath(CDOTransferElement element)
{
return new Path(element.getName());
diff --git a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferMappingImpl.java b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferMappingImpl.java
index a0c0c2db54..b3de129b38 100644
--- a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferMappingImpl.java
+++ b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferMappingImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, 2016, 2018 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2012, 2015, 2016, 2018, 2019 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -92,26 +92,31 @@ class CDOTransferMappingImpl implements CDOTransferMapping
relativePath = Path.EMPTY;
}
+ @Override
public CDOTransfer getTransfer()
{
return transfer;
}
+ @Override
public CDOTransferElement getSource()
{
return source;
}
+ @Override
public CDOTransferMapping getParent()
{
return parent;
}
+ @Override
public boolean isRoot()
{
return parent == null;
}
+ @Override
public boolean isDirectory()
{
if (source == null)
@@ -122,21 +127,25 @@ class CDOTransferMappingImpl implements CDOTransferMapping
return source.isDirectory();
}
+ @Override
public String getName()
{
return relativePath.lastSegment();
}
+ @Override
public void setName(String name)
{
setRelativePath(relativePath.removeLastSegments(1).append(name));
}
+ @Override
public IPath getRelativePath()
{
return relativePath;
}
+ @Override
public void setRelativePath(IPath path)
{
if (!ObjectUtil.equals(relativePath, path))
@@ -148,11 +157,13 @@ class CDOTransferMappingImpl implements CDOTransferMapping
}
}
+ @Override
public void setRelativePath(String path)
{
setRelativePath(new Path(path));
}
+ @Override
public void accept(Visitor visitor)
{
if (visitor.visit(this) && children != null)
@@ -164,6 +175,7 @@ class CDOTransferMappingImpl implements CDOTransferMapping
}
}
+ @Override
public CDOTransferMapping[] getChildren()
{
if (children == null || children.isEmpty())
@@ -176,6 +188,7 @@ class CDOTransferMappingImpl implements CDOTransferMapping
return result;
}
+ @Override
public CDOTransferMapping getChild(IPath path)
{
if (path.isEmpty())
@@ -195,6 +208,7 @@ class CDOTransferMappingImpl implements CDOTransferMapping
return null;
}
+ @Override
public CDOTransferMapping getChild(String path)
{
return getChild(new Path(path));
@@ -226,6 +240,7 @@ class CDOTransferMappingImpl implements CDOTransferMapping
}
}
+ @Override
public void unmap()
{
transfer.unmap(this);
@@ -235,11 +250,13 @@ class CDOTransferMappingImpl implements CDOTransferMapping
}
}
+ @Override
public CDOTransferType getTransferType()
{
return transferType;
}
+ @Override
public void setTransferType(CDOTransferType transferType)
{
if (!ObjectUtil.equals(this.transferType, transferType))
@@ -250,6 +267,7 @@ class CDOTransferMappingImpl implements CDOTransferMapping
}
}
+ @Override
public IPath getFullPath()
{
IPath relativePath = getRelativePath();
@@ -262,6 +280,7 @@ class CDOTransferMappingImpl implements CDOTransferMapping
return path.append(relativePath);
}
+ @Override
public Status getStatus()
{
if (status == null)
@@ -322,6 +341,7 @@ class CDOTransferMappingImpl implements CDOTransferMapping
}
}
+ @Override
public CDOTransferElement getTarget()
{
CDOTransferSystem targetSystem = transfer.getTargetSystem();
@@ -329,6 +349,7 @@ class CDOTransferMappingImpl implements CDOTransferMapping
return targetSystem.getElement(fullPath);
}
+ @Override
public int compareTo(CDOTransferMapping o)
{
boolean directory = isDirectory();
diff --git a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferType.java b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferType.java
index 10f70503c0..aba1f44e54 100644
--- a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferType.java
+++ b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferType.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Eike Stepper (Loehne, Germany) and others.
+ * Copyright (c) 2012, 2019 Eike Stepper (Loehne, Germany) and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -89,6 +89,7 @@ public class CDOTransferType implements Comparable<CDOTransferType>
return ObjectUtil.equals(toString(), obj.toString());
}
+ @Override
public int compareTo(CDOTransferType o)
{
return toString().compareTo(o.toString());

Back to the top