Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2016-10-18 15:30:55 +0000
committerEike Stepper2016-10-18 15:30:55 +0000
commitd271b313d58d5eef02ed687c151a42dfd0c0f0ed (patch)
tree57ca0c57f33f0780f6092613bab565d35f7986af /plugins/org.eclipse.emf.cdo.dawn.ui
parent6809f0af826be94b174d4e1a45d75e686813d267 (diff)
downloadcdo-d271b313d58d5eef02ed687c151a42dfd0c0f0ed.tar.gz
cdo-d271b313d58d5eef02ed687c151a42dfd0c0f0ed.tar.xz
cdo-d271b313d58d5eef02ed687c151a42dfd0c0f0ed.zip
[Releng] Increase max line length to 160
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.dawn.ui')
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.core.prefs2
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/handlers/SolveConflictHandler.java4
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/stylizer/DawnElementStylizerRegistry.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnExplorer.java6
-rw-r--r--plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewDiagramResourceWizardPage.java4
5 files changed, 9 insertions, 13 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.core.prefs
index 48aafaf7ea..3413c04844 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/.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.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/handlers/SolveConflictHandler.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/handlers/SolveConflictHandler.java
index fc65b55ac2..38a7aa1d60 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/handlers/SolveConflictHandler.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/handlers/SolveConflictHandler.java
@@ -41,8 +41,8 @@ public class SolveConflictHandler extends AbstractHandler
if (activeEditor instanceof IDawnEditor)
{
MessageDialog dialog = new MessageDialog(DawnEditorHelper.getActiveShell(), "Conflict", null,
- "There are conflicts in your diagram. Would you like to rollback your current transaction?",
- MessageDialog.QUESTION, new String[] { "yes", "no", "Cancel" }, 1);
+ "There are conflicts in your diagram. Would you like to rollback your current transaction?", MessageDialog.QUESTION,
+ new String[] { "yes", "no", "Cancel" }, 1);
switch (dialog.open())
{
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/stylizer/DawnElementStylizerRegistry.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/stylizer/DawnElementStylizerRegistry.java
index 120f24be62..86b67129b7 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/stylizer/DawnElementStylizerRegistry.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/stylizer/DawnElementStylizerRegistry.java
@@ -103,15 +103,13 @@ public class DawnElementStylizerRegistry
{
try
{
- IConfigurationElement[] config = Platform.getExtensionRegistry()
- .getConfigurationElementsFor(DAWN_STYLIZER_FACTORY_EXTENSION_POINT_ID);
+ IConfigurationElement[] config = Platform.getExtensionRegistry().getConfigurationElementsFor(DAWN_STYLIZER_FACTORY_EXTENSION_POINT_ID);
for (IConfigurationElement e : config)
{
String factoryClassName = e.getAttribute(ATTRIIBUTE_FACTORY);
if (!stylizerFactories.containsKey(factoryClassName))
{
- IDawnElementStylizerFactory stylizer = (IDawnElementStylizerFactory)e
- .createExecutableExtension(ATTRIIBUTE_FACTORY);
+ IDawnElementStylizerFactory stylizer = (IDawnElementStylizerFactory)e.createExecutableExtension(ATTRIIBUTE_FACTORY);
int priority = Integer.parseInt(e.getAttribute(ATTRIBUTE_PRIORITY).substring(0, 1));
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnExplorer.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnExplorer.java
index 6ea42b8c47..74011e36d6 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnExplorer.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/views/DawnExplorer.java
@@ -89,8 +89,7 @@ public class DawnExplorer extends CDOSessionsView
{
try
{
- CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(),
- PreferenceConstants.getServerName());
+ CDOConnectionUtil.instance.init(PreferenceConstants.getRepositoryName(), PreferenceConstants.getProtocol(), PreferenceConstants.getServerName());
CDOSession session = CDOConnectionUtil.instance.openSession();
view = CDOConnectionUtil.instance.openView(session);
}
@@ -154,8 +153,7 @@ public class DawnExplorer extends CDOSessionsView
else
{
CDOTransaction transaction = view.getSession().openTransaction();
- CDOEditorInput editorInput = CDOEditorUtil.createCDOEditorInput(transaction, ((CDOResource)obj).getPath(),
- true);
+ CDOEditorInput editorInput = CDOEditorUtil.createCDOEditorInput(transaction, ((CDOResource)obj).getPath(), true);
try
{
DawnExplorer.this.getSite().getPage().openEditor(editorInput, CDOEditorUtil.getEditorID());
diff --git a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewDiagramResourceWizardPage.java b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewDiagramResourceWizardPage.java
index 569f4af7be..abff4467dd 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewDiagramResourceWizardPage.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.ui/src/org/eclipse/emf/cdo/dawn/ui/wizards/DawnCreateNewDiagramResourceWizardPage.java
@@ -34,7 +34,7 @@ public class DawnCreateNewDiagramResourceWizardPage extends DawnCreateNewResourc
public URI getURI()
{
// TODO check why the dawn resource must be connected this way
- return URI.createURI("dawn://" + PreferenceConstants.getRepositoryName() + "/" + chooserComposite.getResourcePath()
- + "/" + chooserComposite.getResourceName());
+ return URI
+ .createURI("dawn://" + PreferenceConstants.getRepositoryName() + "/" + chooserComposite.getResourcePath() + "/" + chooserComposite.getResourceName());
}
}

Back to the top