Author: vyemialyanchyk Date: 2008-06-04 10:57:22 -0400 (Wed, 04 Jun 2008) New Revision: 8546 Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/Messages.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/messages.properties Removed: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUIMessages.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUIMessages.properties Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/Activator.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/CriteriaQuickAssistProcessor.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/DebugJavaCompletionProposalComputer.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/ELTransformer.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/ExternalActionQuickAssistProposal.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/HQLDetector.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/HQLJavaCompletionProposalComputer.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/HQLQuickAssistProcessor.java trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/SaveQueryEditorListener.java Log: http://opensource.atlassian.com/projects/hibernate/browse/HBX-500 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/Activator.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/Activator.java 2008-06-04 14:33:46 UTC (rev 8545) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/Activator.java 2008-06-04 14:57:22 UTC (rev 8546) @@ -30,9 +30,9 @@ public class Activator extends AbstractUIPlugin { // The plug-in ID - public static final String PLUGIN_ID = "org.hibernate.eclipse.jdt.ui"; + public static final String PLUGIN_ID = "org.hibernate.eclipse.jdt.ui"; //$NON-NLS-1$ - public static final String HQL_SYNTAX_PROBLEM = PLUGIN_ID + ".hqlsyntax.problem"; + public static final String HQL_SYNTAX_PROBLEM = PLUGIN_ID + ".hqlsyntax.problem"; //$NON-NLS-1$ // The shared instance private static Activator plugin; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/CriteriaQuickAssistProcessor.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/CriteriaQuickAssistProcessor.java 2008-06-04 14:33:46 UTC (rev 8545) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/CriteriaQuickAssistProcessor.java 2008-06-04 14:57:22 UTC (rev 8546) @@ -58,7 +58,7 @@ // position of selection final Point position = new Point( context.getSelectionOffset(), context.getSelectionLength() ); result = new IJavaCompletionProposal[1]; - result[0] = new ExternalActionQuickAssistProposal(contents, EclipseImages.getImage(ImageConstants.CRITERIA_EDITOR), "Copy to Criteria Editor", context) { + result[0] = new ExternalActionQuickAssistProposal(contents, EclipseImages.getImage(ImageConstants.CRITERIA_EDITOR), Messages.CRITERIAQUICKASSISTPROCESSOR_COPY_TO_CRITERIA_EDITOR, context) { public void apply(IDocument target) { //IEditorPart editorPart = HibernateConsolePlugin.getDefault().openCriteriaEditor(getName(), getContents()); IEditorPart editorPart = Activator.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); @@ -69,7 +69,7 @@ }; } catch (BadLocationException e) { - HibernateConsolePlugin.getDefault().logErrorMessage( JdtUIMessages.CriteriaQuickAssistProcessor_errorMessage, e ); + HibernateConsolePlugin.getDefault().logErrorMessage( Messages.CRITERIAQUICKASSISTPROCESSOR_ERRORMESSAGE, e ); } return result; } Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/DebugJavaCompletionProposalComputer.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/DebugJavaCompletionProposalComputer.java 2008-06-04 14:33:46 UTC (rev 8545) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/DebugJavaCompletionProposalComputer.java 2008-06-04 14:57:22 UTC (rev 8546) @@ -48,7 +48,7 @@ public List computeCompletionProposals(ContentAssistInvocationContext context, IProgressMonitor monitor) { List proposals = new ArrayList(); - proposals.add( new CompletionProposal("hibernate tools", context.getInvocationOffset(), 7, context.getInvocationOffset()) ); + proposals.add( new CompletionProposal( "hibernate tools", context.getInvocationOffset(), 7, context.getInvocationOffset()) ); //$NON-NLS-1$ CharSequence computeIdentifierPrefix = null; try { computeIdentifierPrefix = context.computeIdentifierPrefix(); @@ -57,13 +57,13 @@ // TODO Auto-generated catch block e.printStackTrace(); } - proposals.add( new CompletionProposal("ctxid: [" + computeIdentifierPrefix + "]", context.getInvocationOffset(), 7, context.getInvocationOffset()) ); - proposals.add( new CompletionProposal("Class: " + context.getClass(), context.getInvocationOffset() ,7, context.getInvocationOffset()) ); + proposals.add( new CompletionProposal("ctxid: [" + computeIdentifierPrefix + "]", context.getInvocationOffset(), 7, context.getInvocationOffset()) ); //$NON-NLS-1$//$NON-NLS-2$ + proposals.add( new CompletionProposal("Class: " + context.getClass(), context.getInvocationOffset() ,7, context.getInvocationOffset()) ); //$NON-NLS-1$ if(context instanceof JavaContentAssistInvocationContext) { JavaContentAssistInvocationContext jcaic = (JavaContentAssistInvocationContext) context; - proposals.add( new CompletionProposal("Cu: " + jcaic.getCompilationUnit(), context.getInvocationOffset() ,7, context.getInvocationOffset()) ); - proposals.add( new CompletionProposal("Corectx: " + jcaic.getCoreContext(), context.getInvocationOffset() ,7, context.getInvocationOffset()) ); - proposals.add( new CompletionProposal("type: " + jcaic.getExpectedType(), context.getInvocationOffset() ,7, context.getInvocationOffset()) ); + proposals.add( new CompletionProposal("Cu: " + jcaic.getCompilationUnit(), context.getInvocationOffset() ,7, context.getInvocationOffset()) ); //$NON-NLS-1$ + proposals.add( new CompletionProposal("Corectx: " + jcaic.getCoreContext(), context.getInvocationOffset() ,7, context.getInvocationOffset()) ); //$NON-NLS-1$ + proposals.add( new CompletionProposal("type: " + jcaic.getExpectedType(), context.getInvocationOffset() ,7, context.getInvocationOffset()) ); //$NON-NLS-1$ } proposals.add( new MyCompletionProposal() ); @@ -73,8 +73,8 @@ public static class MyCompletionProposal implements ICompletionProposal { public void apply(IDocument document) { - ErrorDialog.openError( null, "My Loce", "Can't get", new Status(Status.ERROR, "bla", 3, "sdfsdf", null) ); - new CompletionProposal("Test", 2 ,7, 3).apply(document); + ErrorDialog.openError( null, "My Loce", "Can't get", new Status(Status.ERROR, "bla", 3, "sdfsdf", null) ); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$//$NON-NLS-4$ + new CompletionProposal("Test", 2 ,7, 3).apply(document); //$NON-NLS-1$ } public String getAdditionalProposalInfo() { @@ -86,7 +86,7 @@ } public String getDisplayString() { - return JdtUIMessages.DebugJavaCompletionProposalComputer_displayString; + return Messages.DEBUGJAVACOMPLETIONPROPOSALCOMPUTER_DISPLAYSTRING; } public Image getImage() { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/ELTransformer.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/ELTransformer.java 2008-06-04 14:33:46 UTC (rev 8545) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/ELTransformer.java 2008-06-04 14:57:22 UTC (rev 8546) @@ -8,18 +8,18 @@ * @return */ static public String removeEL(String hql) { - int elStart = hql.indexOf("#{"); - int next = hql.indexOf("}", elStart); + int elStart = hql.indexOf("#{"); //$NON-NLS-1$ + int next = hql.indexOf("}", elStart); //$NON-NLS-1$ while(elStart!=-1 && next!=-1) { String result = hql.substring(0, elStart); - result += ":_" + hql.substring(elStart+2, next).replaceAll("[^\\p{javaJavaIdentifierStart}]","_") + "_"; + result += ":_" + hql.substring(elStart+2, next).replaceAll("[^\\p{javaJavaIdentifierStart}]","_") + "_"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ result += hql.substring(next+1); hql = result; - elStart = hql.indexOf("#{"); - next = hql.indexOf("}", elStart); + elStart = hql.indexOf("#{"); //$NON-NLS-1$ + next = hql.indexOf("}", elStart); //$NON-NLS-1$ } return hql; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/ExternalActionQuickAssistProposal.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/ExternalActionQuickAssistProposal.java 2008-06-04 14:33:46 UTC (rev 8545) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/ExternalActionQuickAssistProposal.java 2008-06-04 14:57:22 UTC (rev 8546) @@ -47,7 +47,7 @@ name = null; } - proposal = new CompletionProposal("",context.getSelectionLength(),0,context.getSelectionOffset()+context.getSelectionLength(), image, description, null,null); + proposal = new CompletionProposal("",context.getSelectionLength(),0,context.getSelectionOffset()+context.getSelectionLength(), image, description, null,null); //$NON-NLS-1$ } public String getContents() { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/HQLDetector.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/HQLDetector.java 2008-06-04 14:33:46 UTC (rev 8545) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/HQLDetector.java 2008-06-04 14:57:22 UTC (rev 8546) @@ -34,11 +34,11 @@ } public boolean visit(NormalAnnotation node) { - if(node.getTypeName().getFullyQualifiedName().endsWith( "NamedQuery" )) { + if(node.getTypeName().getFullyQualifiedName().endsWith( "NamedQuery" )) { //$NON-NLS-1$ Iterator iterator = node.values().iterator(); while ( iterator.hasNext() ) { MemberValuePair element = (MemberValuePair) iterator.next(); - if(element.getName().getIdentifier().equals("query")) { + if(element.getName().getIdentifier().equals("query")) { //$NON-NLS-1$ Expression value = element.getValue(); if(value instanceof StringLiteral) { StringLiteral sl = (StringLiteral)value; @@ -74,7 +74,7 @@ } public boolean visit(MethodInvocation node) { - if(node.getName().getIdentifier().equals( "createQuery" )) { + if(node.getName().getIdentifier().equals( "createQuery" )) { //$NON-NLS-1$ if(node.arguments().size()==1) { Object object = node.arguments().get(0); if(object instanceof StringLiteral) { Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/HQLJavaCompletionProposalComputer.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/HQLJavaCompletionProposalComputer.java 2008-06-04 14:33:46 UTC (rev 8545) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/HQLJavaCompletionProposalComputer.java 2008-06-04 14:57:22 UTC (rev 8546) @@ -76,7 +76,7 @@ IHQLCodeAssist hqlEval = new HQLCodeAssist(configuration); - String query = ""; + String query = ""; //$NON-NLS-1$ int stringStart = getStringStart( ctx.getDocument(), ctx.getInvocationOffset() ); int stringEnd = getStringEnd( ctx.getDocument(), ctx.getInvocationOffset() ); query = ctx.getDocument().get(stringStart, stringEnd-stringStart ); @@ -87,10 +87,10 @@ proposals = eclipseHQLCompletionCollector.getCompletionProposals(); } } catch(RuntimeException re) { - HibernateConsolePlugin.getDefault().logErrorMessage( JdtUIMessages.HQLJavaCompletionProposalComputer_errorMessage, re ); + HibernateConsolePlugin.getDefault().logErrorMessage( Messages.HQLJAVACOMPLETIONPROPOSALCOMPUTER_ERRORMESSAGE, re ); } catch (BadLocationException e) { - HibernateConsolePlugin.getDefault().logErrorMessage( JdtUIMessages.HQLJavaCompletionProposalComputer_errorMessage, e ); + HibernateConsolePlugin.getDefault().logErrorMessage( Messages.HQLJAVACOMPLETIONPROPOSALCOMPUTER_ERRORMESSAGE, e ); } return proposals; Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/HQLQuickAssistProcessor.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/HQLQuickAssistProcessor.java 2008-06-04 14:33:46 UTC (rev 8545) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/HQLQuickAssistProcessor.java 2008-06-04 14:57:22 UTC (rev 8546) @@ -52,7 +52,7 @@ final StringLiteral stringLiteral= (StringLiteral) coveringNode; String contents= stringLiteral.getLiteralValue(); result = new IJavaCompletionProposal[1]; - result[0] = new ExternalActionQuickAssistProposal(contents, EclipseImages.getImage(ImageConstants.HQL_EDITOR), "Copy to HQL Editor", context) { + result[0] = new ExternalActionQuickAssistProposal(contents, EclipseImages.getImage(ImageConstants.HQL_EDITOR), Messages.HQLQUICKASSISTPROCESSOR_COPY_TO_HQL_EDITOR, context) { public void apply(IDocument document) { IEditorPart editorPart = Activator.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(); ITextEditor[] textEditors = OpenMappingAction.getTextEditors(editorPart); Deleted: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUIMessages.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUIMessages.java 2008-06-04 14:33:46 UTC (rev 8545) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUIMessages.java 2008-06-04 14:57:22 UTC (rev 8546) @@ -1,57 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007-2008 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributor: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.hibernate.eclipse.jdt.ui.internal; - -import org.eclipse.osgi.util.NLS; - -/** - * @author Dmitry Geraskov - * - */ -public class JdtUIMessages extends NLS { - - private static final String BUNDLE_NAME= "org.hibernate.eclipse.jdt.ui.internal.JdtUIMessages";//$NON-NLS-1$ - - public static String SaveQueryEditorListener_hql_editor; - - public static String SaveQueryEditorListener_cri_editor; - - public static String SaveQueryEditorListener_Composite_Change_Name; - - public static String SaveQueryEditorListener_Change_Name; - - public static String SaveQueryEditorListener_refactoringTitle; - - public static String SaveQueryEditorListener_replaceQuestion; - - public static String SaveQueryEditorListener_replaceTitle; - - public static String SaveQueryEditorListener_replaceQuestion_confirm; - - public static String SaveQueryEditorListener_replaceTitle_info; - - public static String CriteriaQuickAssistProcessor_errorMessage; - - public static String DebugJavaCompletionProposalComputer_displayString; - - public static String HQLJavaCompletionProposalComputer_errorMessage; - - public static String SaveQueryEditorListener_errorMessage; - - static { - NLS.initializeMessages(BUNDLE_NAME, JdtUIMessages.class); - } - - private JdtUIMessages(){ - // Do not instantiate - } - -} Deleted: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUIMessages.properties =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUIMessages.properties 2008-06-04 14:33:46 UTC (rev 8545) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/JdtUIMessages.properties 2008-06-04 14:57:22 UTC (rev 8546) @@ -1,29 +0,0 @@ -############################################################################### -# Copyright (c) 2007-2008 Red Hat, Inc. -# Distributed under license by Red Hat, Inc. All rights reserved. -# This program is made available under the terms of the -# Eclipse Public License v1.0 which accompanies this distribution, -# and is available at http://www.eclipse.org/legal/epl-v10.html -# -# Contributor: -# Red Hat, Inc. - initial API and implementation -##############################################################################/ - - -SaveQueryEditorListener_replaceQuestion= Do you want to save this {0} query into ''{1}''? -SaveQueryEditorListener_replaceTitle= Query replace -SaveQueryEditorListener_hql_editor=HQL -SaveQueryEditorListener_cri_editor=Criteria -SaveQueryEditorListener_Change_Name=Update {0} query in ''{1}'' -SaveQueryEditorListener_Composite_Change_Name=Update {0} query -SaveQueryEditorListener_refactoringTitle= Update {0} query in file - -SaveQueryEditorListener_replaceTitle_info= Query replace -SaveQueryEditorListener_replaceQuestion_confirm= ''{0}'' was changed. It is not possible to update the query. - -CriteriaQuickAssistProcessor_errorMessage= Could not get document contents for CriteriaQuickAssist - -DebugJavaCompletionProposalComputer_displayString= I wanna show a dialog! - -HQLJavaCompletionProposalComputer_errorMessage= Error while performing HQL completion in java -SaveQueryEditorListener_errorMessage=Error while query refactoring \ No newline at end of file Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/Messages.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/Messages.java (rev 0) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/Messages.java 2008-06-04 14:57:22 UTC (rev 8546) @@ -0,0 +1,29 @@ +package org.hibernate.eclipse.jdt.ui.internal; + +import org.eclipse.osgi.util.NLS; + +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.hibernate.eclipse.jdt.ui.internal.messages"; //$NON-NLS-1$ + public static String SAVEQUERYEDITORLISTENER_REPLACEQUESTION; + public static String SAVEQUERYEDITORLISTENER_REPLACETITLE; + public static String SAVEQUERYEDITORLISTENER_HQL_EDITOR; + public static String SAVEQUERYEDITORLISTENER_CRI_EDITOR; + public static String SAVEQUERYEDITORLISTENER_CHANGE_NAME; + public static String SAVEQUERYEDITORLISTENER_COMPOSITE_CHANGE_NAME; + public static String SAVEQUERYEDITORLISTENER_REFACTORINGTITLE; + public static String SAVEQUERYEDITORLISTENER_REPLACETITLE_INFO; + public static String SAVEQUERYEDITORLISTENER_REPLACEQUESTION_CONFIRM; + public static String SAVEQUERYEDITORLISTENER_ERRORMESSAGE; + public static String CRITERIAQUICKASSISTPROCESSOR_COPY_TO_CRITERIA_EDITOR; + public static String CRITERIAQUICKASSISTPROCESSOR_ERRORMESSAGE; + public static String DEBUGJAVACOMPLETIONPROPOSALCOMPUTER_DISPLAYSTRING; + public static String HQLJAVACOMPLETIONPROPOSALCOMPUTER_ERRORMESSAGE; + public static String HQLQUICKASSISTPROCESSOR_COPY_TO_HQL_EDITOR; + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/SaveQueryEditorListener.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/SaveQueryEditorListener.java 2008-06-04 14:33:46 UTC (rev 8545) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/SaveQueryEditorListener.java 2008-06-04 14:57:22 UTC (rev 8546) @@ -125,18 +125,18 @@ final String editorTitle = fromEditorPart.getTitle(); final String editor_name = editor instanceof HQLEditor - ? JdtUIMessages.SaveQueryEditorListener_hql_editor - : JdtUIMessages.SaveQueryEditorListener_cri_editor; + ? Messages.SAVEQUERYEDITORLISTENER_HQL_EDITOR + : Messages.SAVEQUERYEDITORLISTENER_CRI_EDITOR; if (isDocChanged){ - String information_message = NLS.bind(JdtUIMessages.SaveQueryEditorListener_replaceQuestion_confirm, editorTitle); - MessageDialog.openInformation(null, JdtUIMessages.SaveQueryEditorListener_replaceTitle_info, information_message); + String information_message = NLS.bind(Messages.SAVEQUERYEDITORLISTENER_REPLACEQUESTION_CONFIRM, editorTitle); + MessageDialog.openInformation(null, Messages.SAVEQUERYEDITORLISTENER_REPLACETITLE_INFO, information_message); return; } final String newQuery = editor.getQueryString(); - final String wizard_title = NLS.bind(JdtUIMessages.SaveQueryEditorListener_refactoringTitle, editor_name); + final String wizard_title = NLS.bind(Messages.SAVEQUERYEDITORLISTENER_REFACTORINGTITLE, editor_name); Refactoring ref = new Refactoring(){ @@ -152,12 +152,12 @@ @Override public Change createChange(IProgressMonitor pm){ - String change_name = NLS.bind(JdtUIMessages.SaveQueryEditorListener_Change_Name, editor_name, editorTitle); + String change_name = NLS.bind(Messages.SAVEQUERYEDITORLISTENER_CHANGE_NAME, editor_name, editorTitle); DocumentChange change = new DocumentChange(change_name, doc); TextEdit replaceEdit = new ReplaceEdit(position.x, position.y, newQuery); change.setEdit(replaceEdit); - String cc_name = NLS.bind(JdtUIMessages.SaveQueryEditorListener_Composite_Change_Name, editor_name); + String cc_name = NLS.bind(Messages.SAVEQUERYEDITORLISTENER_COMPOSITE_CHANGE_NAME, editor_name); final CompositeChange cc = new CompositeChange(cc_name); cc.add(change); return cc; @@ -165,7 +165,7 @@ @Override public String getName() { - return JdtUIMessages.SaveQueryEditorListener_Composite_Change_Name; + return Messages.SAVEQUERYEDITORLISTENER_COMPOSITE_CHANGE_NAME; } }; @@ -181,7 +181,7 @@ layout.numColumns = 1; layout.verticalSpacing = 9; Label label = new Label(container, SWT.NULL); - label.setText(NLS.bind(JdtUIMessages.SaveQueryEditorListener_replaceQuestion, editor_name, editorTitle )); + label.setText(NLS.bind(Messages.SAVEQUERYEDITORLISTENER_REPLACEQUESTION, editor_name, editorTitle )); setControl(container); } }; Added: trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/messages.properties =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/messages.properties (rev 0) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/messages.properties 2008-06-04 14:57:22 UTC (rev 8546) @@ -0,0 +1,26 @@ +############################################################################### +# Copyright (c) 2007-2008 Red Hat, Inc. +# Distributed under license by Red Hat, Inc. All rights reserved. +# This program is made available under the terms of the +# Eclipse Public License v1.0 which accompanies this distribution, +# and is available at http://www.eclipse.org/legal/epl-v10.html +# +# Contributor: +# Red Hat, Inc. - initial API and implementation +##############################################################################/ + +SAVEQUERYEDITORLISTENER_REPLACEQUESTION= Do you want to save this {0} query into ''{1}''? +SAVEQUERYEDITORLISTENER_REPLACETITLE= Query replace +SAVEQUERYEDITORLISTENER_HQL_EDITOR=HQL +SAVEQUERYEDITORLISTENER_CRI_EDITOR=Criteria +SAVEQUERYEDITORLISTENER_CHANGE_NAME=Update {0} query in ''{1}'' +SAVEQUERYEDITORLISTENER_COMPOSITE_CHANGE_NAME=Update {0} query +SAVEQUERYEDITORLISTENER_REFACTORINGTITLE= Update {0} query in file +SAVEQUERYEDITORLISTENER_REPLACETITLE_INFO= Query replace +SAVEQUERYEDITORLISTENER_REPLACEQUESTION_CONFIRM= ''{0}'' was changed. It is not possible to update the query. +SAVEQUERYEDITORLISTENER_ERRORMESSAGE=Error while query refactoring +CRITERIAQUICKASSISTPROCESSOR_COPY_TO_CRITERIA_EDITOR=Copy to Criteria Editor +CRITERIAQUICKASSISTPROCESSOR_ERRORMESSAGE= Could not get document contents for CriteriaQuickAssist +DEBUGJAVACOMPLETIONPROPOSALCOMPUTER_DISPLAYSTRING= I wanna show a dialog! +HQLJAVACOMPLETIONPROPOSALCOMPUTER_ERRORMESSAGE= Error while performing HQL completion in java +HQLQUICKASSISTPROCESSOR_COPY_TO_HQL_EDITOR=Copy to HQL Editor