From d271b313d58d5eef02ed687c151a42dfd0c0f0ed Mon Sep 17 00:00:00 2001 From: Eike Stepper Date: Tue, 18 Oct 2016 17:30:55 +0200 Subject: [Releng] Increase max line length to 160 --- .../.settings/org.eclipse.jdt.core.prefs | 2 +- .../cdo/explorer/repositories/CDORepository.java | 4 +-- .../emf/cdo/internal/explorer/AbstractManager.java | 3 +- .../emf/cdo/internal/explorer/bundle/OM.java | 3 +- .../explorer/checkouts/CDOCheckoutManagerImpl.java | 6 ++-- .../explorer/checkouts/CDOCheckoutProperties.java | 19 ++++------ .../checkouts/CDOCheckoutViewProvider.java | 3 +- .../explorer/repositories/CDORepositoryImpl.java | 42 +++++++++++----------- .../repositories/CDORepositoryManagerImpl.java | 3 +- .../repositories/CDORepositoryProperties.java | 3 +- .../explorer/repositories/CloneCDORepository.java | 3 +- .../explorer/repositories/LocalCDORepository.java | 4 +-- 12 files changed, 40 insertions(+), 55 deletions(-) (limited to 'plugins/org.eclipse.emf.cdo.explorer') diff --git a/plugins/org.eclipse.emf.cdo.explorer/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.explorer/.settings/org.eclipse.jdt.core.prefs index 48aafaf7ea..3413c04844 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.emf.cdo.explorer/.settings/org.eclipse.jdt.core.prefs @@ -366,7 +366,7 @@ org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=120 +org.eclipse.jdt.core.formatter.lineSplit=160 org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java index 0e4ff306e2..5b7c83b8da 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java +++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/explorer/repositories/CDORepository.java @@ -32,8 +32,8 @@ import org.eclipse.net4j.util.security.IPasswordCredentialsProvider2; * @noextend This interface is not intended to be extended by clients. * @noimplement This interface is not intended to be implemented by clients. */ -public interface CDORepository extends CDOExplorerElement, IContainer, IPasswordCredentialsProvider2, - CDOSessionProvider, CDOViewOpener, CDOTransactionOpener +public interface CDORepository + extends CDOExplorerElement, IContainer, IPasswordCredentialsProvider2, CDOSessionProvider, CDOViewOpener, CDOTransactionOpener { public static final String TYPE_REMOTE = "remote"; diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/AbstractManager.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/AbstractManager.java index 77be55c28c..161d508da1 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/AbstractManager.java +++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/AbstractManager.java @@ -39,8 +39,7 @@ import java.util.regex.Pattern; /** * @author Eike Stepper */ -public abstract class AbstractManager extends SetContainer - implements CDOExplorerManager +public abstract class AbstractManager extends SetContainer implements CDOExplorerManager { private static final Pattern LABEL_PATTERN = Pattern.compile("(.+?) *\\([0-9]+\\)"); diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/bundle/OM.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/bundle/OM.java index 49129f571b..dfd3aa7e1d 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/bundle/OM.java +++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/bundle/OM.java @@ -38,8 +38,7 @@ public abstract class OM public static final OMLogger LOG = BUNDLE.logger(); - private static final String STATE_LOCATION = OMPlatform.INSTANCE - .getProperty("org.eclipse.emf.cdo.explorer.stateLocation"); + private static final String STATE_LOCATION = OMPlatform.INSTANCE.getProperty("org.eclipse.emf.cdo.explorer.stateLocation"); private static String stateLocation; diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java index cea378f369..cc2eda281f 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java +++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutManagerImpl.java @@ -69,8 +69,7 @@ public class CDOCheckoutManagerImpl extends AbstractManager impleme return newElement(properties); } - public void fireCheckoutOpenEvent(CDOCheckout checkout, CDOView view, CDOCheckout.State oldState, - CDOCheckout.State newState) + public void fireCheckoutOpenEvent(CDOCheckout checkout, CDOView view, CDOCheckout.State oldState, CDOCheckout.State newState) { if (view != null) { @@ -148,8 +147,7 @@ public class CDOCheckoutManagerImpl extends AbstractManager impleme private final CDOCheckout.State newState; - public CheckoutStateEventImpl(CDOCheckoutManager repositoryManager, CDOCheckout checkout, - CDOCheckout.State oldState, CDOCheckout.State newState) + public CheckoutStateEventImpl(CDOCheckoutManager repositoryManager, CDOCheckout checkout, CDOCheckout.State oldState, CDOCheckout.State newState) { super(repositoryManager); this.checkout = checkout; diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutProperties.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutProperties.java index fc0035b195..77f4fd0ed2 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutProperties.java +++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutProperties.java @@ -171,8 +171,8 @@ public class CDOCheckoutProperties extends Properties } }); - add(new Property("repositoryConnected", "Connected", - "Whether the repository of this checkout is connected", CDORepositoryProperties.CATEGORY_REPOSITORY) + add(new Property("repositoryConnected", "Connected", "Whether the repository of this checkout is connected", + CDORepositoryProperties.CATEGORY_REPOSITORY) { @Override protected Object eval(CDOCheckout checkout) @@ -187,8 +187,7 @@ public class CDOCheckoutProperties extends Properties } }); - add(new Property("repositoryType", "Type", "The type of the repository of this checkout", - CDORepositoryProperties.CATEGORY_REPOSITORY) + add(new Property("repositoryType", "Type", "The type of the repository of this checkout", CDORepositoryProperties.CATEGORY_REPOSITORY) { @Override protected Object eval(CDOCheckout checkout) @@ -203,8 +202,7 @@ public class CDOCheckoutProperties extends Properties } }); - add(new Property("repositoryID", "ID", "The ID of the repository of this checkout", - CDORepositoryProperties.CATEGORY_REPOSITORY) + add(new Property("repositoryID", "ID", "The ID of the repository of this checkout", CDORepositoryProperties.CATEGORY_REPOSITORY) { @Override protected Object eval(CDOCheckout checkout) @@ -219,8 +217,7 @@ public class CDOCheckoutProperties extends Properties } }); - add(new Property("repositoryLabel", "Label", "The label of the repository of this checkout", - CDORepositoryProperties.CATEGORY_REPOSITORY) + add(new Property("repositoryLabel", "Label", "The label of the repository of this checkout", CDORepositoryProperties.CATEGORY_REPOSITORY) { @Override protected Object eval(CDOCheckout checkout) @@ -235,8 +232,7 @@ public class CDOCheckoutProperties extends Properties } }); - add(new Property("repositoryFolder", "Folder", "The folder of the repository of this checkout", - CDORepositoryProperties.CATEGORY_REPOSITORY) + add(new Property("repositoryFolder", "Folder", "The folder of the repository of this checkout", CDORepositoryProperties.CATEGORY_REPOSITORY) { @Override protected Object eval(CDOCheckout checkout) @@ -251,8 +247,7 @@ public class CDOCheckoutProperties extends Properties } }); - add(new Property("repositoryURI", "URI", "The URI of the repository of this checkout", - CDORepositoryProperties.CATEGORY_REPOSITORY) + add(new Property("repositoryURI", "URI", "The URI of the repository of this checkout", CDORepositoryProperties.CATEGORY_REPOSITORY) { @Override protected Object eval(CDOCheckout checkout) diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutViewProvider.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutViewProvider.java index 95926d4dbb..590c3428e2 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutViewProvider.java +++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/checkouts/CDOCheckoutViewProvider.java @@ -203,8 +203,7 @@ public class CDOCheckoutViewProvider extends AbstractCDOViewProvider { EList adapters = resourceSet.eAdapters(); - CheckoutViewProviderAdapter adapter = (CheckoutViewProviderAdapter)EcoreUtil.getAdapter(adapters, - CheckoutViewProviderAdapter.class); + CheckoutViewProviderAdapter adapter = (CheckoutViewProviderAdapter)EcoreUtil.getAdapter(adapters, CheckoutViewProviderAdapter.class); if (adapter != null && adapter.getTarget() != resourceSet) { adapters.remove(adapter); diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java index b41a0f4f70..267ce499ee 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java +++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryImpl.java @@ -627,27 +627,26 @@ public abstract class CDORepositoryImpl extends AbstractElement implements CDORe { counters = new HashMap(); CDOView view = CDOUtil.getView(object); - view.getSession().getRevisionManager().handleRevisions(null, null, false, CDOBranchPoint.UNSPECIFIED_DATE, - false, new CDORevisionHandler() + view.getSession().getRevisionManager().handleRevisions(null, null, false, CDOBranchPoint.UNSPECIFIED_DATE, false, new CDORevisionHandler() + { + public boolean handleRevision(CDORevision revision) + { + EClass eClass = revision.getEClass(); + AtomicInteger counter = getCounter(eClass); + + String id = revision.getID().toString(); + id = id.substring(0, id.length() - "A".length()); + id = id.substring(id.lastIndexOf('_') + 1); + + int counterValue = Integer.parseInt(id); + if (counterValue > counter.get()) { - public boolean handleRevision(CDORevision revision) - { - EClass eClass = revision.getEClass(); - AtomicInteger counter = getCounter(eClass); - - String id = revision.getID().toString(); - id = id.substring(0, id.length() - "A".length()); - id = id.substring(id.lastIndexOf('_') + 1); - - int counterValue = Integer.parseInt(id); - if (counterValue > counter.get()) - { - counter.set(counterValue); - } - - return true; - } - }); + counter.set(counterValue); + } + + return true; + } + }); } EClass eClass = object.eClass(); @@ -665,8 +664,7 @@ public abstract class CDORepositoryImpl extends AbstractElement implements CDORe AtomicInteger counter = getCounter(eClass); String str = "_" + counter.incrementAndGet(); - String id = type + "____________________________________".substring(0, 22 - type.length() - str.length()) - + str + "A"; + String id = type + "____________________________________".substring(0, 22 - type.length() - str.length()) + str + "A"; if ("_CDOResource_________5A".equals(id)) { diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java index 7edcb61fdc..f2d67be175 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java +++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryManagerImpl.java @@ -146,8 +146,7 @@ public class CDORepositoryManagerImpl extends AbstractManager imp private final boolean connected; - public RepositoryConnectionEventImpl(CDORepositoryManager repositoryManager, CDORepository repository, - boolean connected) + public RepositoryConnectionEventImpl(CDORepositoryManager repositoryManager, CDORepository repository, boolean connected) { super(repositoryManager); this.repository = repository; diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryProperties.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryProperties.java index ec5bc3cab4..e89f3b0063 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryProperties.java +++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CDORepositoryProperties.java @@ -40,8 +40,7 @@ public class CDORepositoryProperties extends Properties } }); - add(new Property("connected", "Connected", "Whether this repository is connected", - CATEGORY_REPOSITORY) + add(new Property("connected", "Connected", "Whether this repository is connected", CATEGORY_REPOSITORY) { @Override protected Object eval(CDORepository repository) diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CloneCDORepository.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CloneCDORepository.java index 46cd5e6eb0..d81e6de836 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CloneCDORepository.java +++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/CloneCDORepository.java @@ -174,8 +174,7 @@ public class CloneCDORepository extends CDORepositoryImpl } }; - IRepositorySynchronizer synchronizer = CDOServerUtil - .createRepositorySynchronizer(remoteSessionConfigurationFactory); + IRepositorySynchronizer synchronizer = CDOServerUtil.createRepositorySynchronizer(remoteSessionConfigurationFactory); repository = CDOServerUtil.createOfflineClone(repositoryName + "-clone", store, props, synchronizer); diff --git a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/LocalCDORepository.java b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/LocalCDORepository.java index 6f7ba1404d..c96cb287e9 100644 --- a/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/LocalCDORepository.java +++ b/plugins/org.eclipse.emf.cdo.explorer/src/org/eclipse/emf/cdo/internal/explorer/repositories/LocalCDORepository.java @@ -126,8 +126,8 @@ public class LocalCDORepository extends CDORepositoryImpl JdbcDataSource dataSource = new JdbcDataSource(); dataSource.setURL("jdbc:h2:" + folder); - IMappingStrategy mappingStrategy = CDODBUtil.createHorizontalMappingStrategy( - getVersioningMode().isSupportingAudits(), getVersioningMode().isSupportingBranches(), false); + IMappingStrategy mappingStrategy = CDODBUtil.createHorizontalMappingStrategy(getVersioningMode().isSupportingAudits(), + getVersioningMode().isSupportingBranches(), false); mappingStrategy.setProperties(getMappingStrategyProperties()); IDBAdapter dbAdapter = DBUtil.getDBAdapter("h2"); -- cgit v1.2.3