diff options
Diffstat (limited to 'plugins')
4 files changed, 16 insertions, 7 deletions
diff --git a/plugins/org.eclipse.jem.util/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.jem.util/.settings/org.eclipse.jdt.core.prefs index 9104605c2..d78073f2c 100644 --- a/plugins/org.eclipse.jem.util/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/org.eclipse.jem.util/.settings/org.eclipse.jdt.core.prefs @@ -1,4 +1,4 @@ -#Thu Jun 16 13:22:48 EDT 2005 +#Tue Feb 21 10:09:19 EST 2006 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -47,9 +47,11 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 @@ -95,10 +97,12 @@ org.eclipse.jdt.core.formatter.compact_else_if=true org.eclipse.jdt.core.formatter.continuation_indentation=2 org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true +org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true +org.eclipse.jdt.core.formatter.indent_empty_lines=false org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true @@ -112,6 +116,7 @@ org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_ini org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert @@ -255,6 +260,7 @@ org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesize org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert +org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert @@ -280,3 +286,4 @@ org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true org.eclipse.jdt.core.formatter.tabulation.char=tab org.eclipse.jdt.core.formatter.tabulation.size=4 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false diff --git a/plugins/org.eclipse.jem.util/.settings/org.eclipse.jdt.ui.prefs b/plugins/org.eclipse.jem.util/.settings/org.eclipse.jdt.ui.prefs index 4cff627b9..6c8e1bc01 100644 --- a/plugins/org.eclipse.jem.util/.settings/org.eclipse.jdt.ui.prefs +++ b/plugins/org.eclipse.jem.util/.settings/org.eclipse.jdt.ui.prefs @@ -1,5 +1,7 @@ -#Wed May 11 16:20:15 EDT 2005 +#Tue Feb 21 10:09:19 EST 2006 eclipse.preferences.version=1 +formatter_profile=_jve +formatter_settings_version=10 org.eclipse.jdt.ui.ignorelowercasenames=true org.eclipse.jdt.ui.importorder=java;javax;org;org.eclipse.wtp;org.eclipse.jem;org.eclipse.ve.internal.cdm;org.eclipse.ve.internal.cde;org.eclipse.ve.internal.jcm;org.eclipse.ve.internal.java;org.eclipse.ve;com; org.eclipse.jdt.ui.ondemandthreshold=3 diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/RegistryReader.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/RegistryReader.java index 94abc281e..b149c4018 100644 --- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/RegistryReader.java +++ b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/RegistryReader.java @@ -10,7 +10,7 @@ *******************************************************************************/ /* * $$RCSfile: RegistryReader.java,v $$ - * $$Revision: 1.3 $$ $$Date: 2005/05/18 21:58:34 $$ + * $$Revision: 1.4 $$ $$Date: 2006/02/21 17:16:30 $$ */ package org.eclipse.jem.util; import org.eclipse.core.runtime.*; @@ -46,7 +46,7 @@ public abstract class RegistryReader { IExtension extension = configurationElement.getDeclaringExtension(); if (extension != null) - pluginId = extension.getNamespace(); + pluginId = extension.getContributor().getName(); } return pluginId; @@ -93,7 +93,7 @@ public abstract class RegistryReader { protected void logError(IConfigurationElement element, String text) { IExtension extension = element.getDeclaringExtension(); StringBuffer buf = new StringBuffer(); - buf.append("Plugin " + extension.getNamespace() + ", extension " + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-1$ //$NON-NLS-2$ + buf.append("Plugin " + extension.getContributor().getName() + ", extension " + extension.getExtensionPointUniqueIdentifier()); //$NON-NLS-1$ //$NON-NLS-2$ buf.append("\n" + text); //$NON-NLS-1$ Logger.getLogger().logError(buf.toString()); } diff --git a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/plugin/JEMUtilPlugin.java b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/plugin/JEMUtilPlugin.java index 0f0ed9139..3e1731e8b 100644 --- a/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/plugin/JEMUtilPlugin.java +++ b/plugins/org.eclipse.jem.util/jemutil/org/eclipse/jem/util/plugin/JEMUtilPlugin.java @@ -10,7 +10,7 @@ *******************************************************************************/ /* * $$RCSfile: JEMUtilPlugin.java,v $$ - * $$Revision: 1.3 $$ $$Date: 2005/06/28 20:13:16 $$ + * $$Revision: 1.4 $$ $$Date: 2006/02/21 17:16:30 $$ */ package org.eclipse.jem.util.plugin; @@ -391,7 +391,7 @@ public class JEMUtilPlugin extends Plugin { String[] names = new String[extensions.length]; if (extensions.length > 0) { for (int i = 0; i < extensions.length; i++) - names[i] = extensions[i].getNamespace(); + names[i] = extensions[i].getContributor().getName(); } return names; } |