Author: dgeraskov Date: 2011-11-10 07:58:10 -0500 (Thu, 10 Nov 2011) New Revision: 36273 Added: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/plugin.properties branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/CompletionProposal.java branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/ConsoleExtension3_5.java branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/EclipseHQLCompletionRequestor.java branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/plugin.properties branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/ConsoleExtension4_0.java Modified: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/META-INF/MANIFEST.MF branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/build.properties branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/plugin.xml branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/build.properties branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/plugin.xml branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java Log: Added extension point to Console plugin Completion proposals are moved to the extension Modified: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/META-INF/MANIFEST.MF =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/META-INF/MANIFEST.MF 2011-11-10 11:02:27 UTC (rev 36272) +++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/META-INF/MANIFEST.MF 2011-11-10 12:58:10 UTC (rev 36273) @@ -4,6 +4,7 @@ Bundle-SymbolicName: org.jboss.tools.hibernateextension3_5;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.jboss.tools.hibernate3_5.HibernateExtension3_5Plugin +Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.hibernate.eclipse;bundle-version="3.4.0", Modified: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/build.properties =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/build.properties 2011-11-10 11:02:27 UTC (rev 36272) +++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/build.properties 2011-11-10 12:58:10 UTC (rev 36273) @@ -1,3 +1,4 @@ output.. = bin/ bin.includes = META-INF/,\ - plugin.xml + plugin.xml,\ + plugin.properties Added: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/plugin.properties =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/plugin.properties (rev 0) +++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/plugin.properties 2011-11-10 12:58:10 UTC (rev 36273) @@ -0,0 +1 @@ +hibernate.version=3.5 \ No newline at end of file Modified: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/plugin.xml =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/plugin.xml 2011-11-10 11:02:27 UTC (rev 36272) +++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/plugin.xml 2011-11-10 12:58:10 UTC (rev 36273) @@ -5,8 +5,15 @@ point="org.hibernate.eclipse.hibernateextension"> <hibernateextension classname="org.jboss.tools.hibernate3_5.HibernateExtension3_5" - version="3.5"> + version="%hibernate.version"> </hibernateextension> </extension> + <extension + point="org.hibernate.eclipse.console.consoleextension"> + <consoleextension + classname="org.jboss.tools.hibernate3_5.ConsoleExtension3_5" + version="%hibernate.version"> + </consoleextension> + </extension> </plugin> Added: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/CompletionProposal.java =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/CompletionProposal.java (rev 0) +++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/CompletionProposal.java 2011-11-10 12:58:10 UTC (rev 36273) @@ -0,0 +1,279 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.tools.hibernate3_5; + +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.jface.text.contentassist.ICompletionProposalExtension; +import org.eclipse.jface.text.contentassist.IContextInformation; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.graphics.Point; +import org.hibernate.eclipse.console.HibernateConsolePlugin; + +/** + * Generic completion proposal to be used as is, or as base for other completion proposals. + * + * @author Max Rydahl Andersen + * + */ +public class CompletionProposal implements ICompletionProposal, ICompletionProposalExtension { + + private String displayString; + private String replacementString; + private int replacementOffset; + private int documentOffset = -1; + private int replacementLength; + private int cursorPosition; + private Image image; + private IContextInformation contextInformation; + private int contextInformationPosition; + private char[] triggerCharacters; + private String additionalProposalInfo; + + /** + * Creates a new completion proposal. All fields are initialized based on + * the provided information. + * + * @param additionalInfo additional information about the completion proposal + * @param replacementString the actual string to be inserted into the document + * @param replacementOffset offset of the text to be replaced + * @param documentOffset offset of the document + * @param replacementLength length of the text to be replaced + * @param image the image to display for this proposal + * @param displayString the string to be displayed for the proposal If set + * to <code>null</code>, the replacement string will be taken + * as display string. + */ + public CompletionProposal( String additionalInfo, String replacementString, int replacementOffset, + int documentOffset, int replacementLength, Image image, String displayString, + IContextInformation contextInformation ) { + + this.replacementString = replacementString; + this.replacementOffset = replacementOffset; + this.documentOffset = documentOffset; + this.replacementLength = replacementLength; + this.image = image; + this.displayString = displayString != null ? displayString : replacementString; + + this.cursorPosition = replacementString.length(); + + this.contextInformation = contextInformation; + + this.triggerCharacters = null; + this.additionalProposalInfo = additionalInfo; + } + + /** + * Creates a new completion proposal. All fields are initialized based on + * the provided information. + * + * @param replacementString the actual string to be inserted into the document + * @param replacementOffset the offset of the text to be replaced + * @param replacementLength the length of the text to be replaced + * @param cursorPosition the position of the cursor following the insert + * relative to replacementOffset + * @param image the image to display for this proposal + * @param displayString the string to be displayed for the proposal + * @param contentInformation the context information associated with this proposal + * @param additionalProposalInfo the additional information associated with + * this proposal + */ + public CompletionProposal( String replacementString, int replacementOffset, int replacementLength, + int cursorPosition, Image image, String displayString, IContextInformation contextInformation, + String additionalProposalInfo ) { + + this.replacementString = replacementString; + this.replacementOffset = replacementOffset; + this.documentOffset = replacementOffset; + this.replacementLength = replacementLength; + this.cursorPosition = cursorPosition; + this.image = image; + this.displayString = displayString; + this.contextInformation = contextInformation; + this.additionalProposalInfo = additionalProposalInfo; + + } + + public void setContextInformation( IContextInformation contextInformation ) { + this.contextInformation = contextInformation; + contextInformationPosition = (contextInformation != null ? cursorPosition : -1); + } + + /** + * Sets the trigger characters. + * + * @param triggerCharacters The set of characters which can trigger the + * application of this completion proposal + */ + public void setTriggerCharacters( char[] triggerCharacters ) { + this.triggerCharacters = triggerCharacters; + } + + /** + * Sets the cursor position relative to the insertion offset. By default + * this is the length of the completion string (Cursor positioned after the + * completion) + * + * @param cursorPosition The cursorPosition to set + */ + public void setCursorPosition( int cursorPosition ) { + + if (cursorPosition >= 0) { + this.cursorPosition = cursorPosition; + this.contextInformationPosition = (contextInformation != null ? cursorPosition : -1); + } + } + + public void apply( IDocument document, char trigger, int offset ) { + try { + // patch replacement length + + int delta = offset - (documentOffset + replacementLength); + if (delta > 0) + replacementLength += delta; + + if (trigger == (char) 0) { + replace( document, documentOffset, replacementLength, replacementString ); + } + else { + StringBuffer buffer = new StringBuffer( replacementString ); + + if ((replacementLength < buffer.length() && buffer.charAt( replacementLength ) != trigger)) { + buffer.insert( cursorPosition, trigger ); + ++cursorPosition; + } + + replace( document, documentOffset, replacementLength, buffer.toString() ); + } + + int oldLen = document.getLength(); + documentOffset += document.getLength() - oldLen; + } + catch (BadLocationException e) { + HibernateConsolePlugin.getDefault().log( e ); + } + } + + /** + * Replaces the document content at the specified offset and length with the + * specified string. + * + * @param document the document opened in the editor + * @param offset offset to the document content to be replaced + * @param length length of text to be replaced + * @param string replacement string + * @throws BadLocationException + */ + private void replace( IDocument document, int offset, int length, String string ) throws BadLocationException { + if (document != null && string != null && offset >= 0 && length >= 0) { + if (!document.get( offset, length ).equals( string )) + document.replace( offset, length, string ); + } + } + + public void apply( IDocument document ) { + apply( document, (char) 0, documentOffset + replacementLength ); + } + + public Point getSelection( IDocument document ) { + return new Point( documentOffset + cursorPosition, 0 ); + } + + public IContextInformation getContextInformation() { + return contextInformation; + } + + public Image getImage() { + return image; + } + + public String getDisplayString() { + return displayString; + } + + public String getAdditionalProposalInfo() { + return additionalProposalInfo; + } + + public char[] getTriggerCharacters() { + return triggerCharacters; + } + + public int getContextInformationPosition() { + return replacementOffset + contextInformationPosition; + } + + public int getReplacementOffset() { + return replacementOffset; + } + + public void setReplacementOffset( int replacementOffset ) { + + if (replacementOffset >= 0) { + this.replacementOffset = replacementOffset; + } + } + + public int getReplacementLength() { + return replacementLength; + } + + public void setReplacementLength( int replacementLength ) { + + if (replacementLength >= 0) { + this.replacementLength = replacementLength; + } + } + + public String getReplacementString() { + return replacementString; + } + + public void setReplacementString( String replacementString ) { + this.replacementString = replacementString; + } + + public void setImage( Image image ) { + this.image = image; + } + + public boolean isValidFor( IDocument document, int offset ) { + if (offset < replacementOffset) + return false; + + int replacementLength = replacementString == null ? 0 : replacementString.length(); + if (offset >= replacementOffset + replacementLength) + return false; + + try { + int length = offset - replacementOffset; + String start = document.get( replacementOffset, length ); + return replacementString.substring( 0, length ).equalsIgnoreCase( start ); + } + catch (BadLocationException x) { + } + + return false; + } + +} \ No newline at end of file Added: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/ConsoleExtension3_5.java =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/ConsoleExtension3_5.java (rev 0) +++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/ConsoleExtension3_5.java 2011-11-10 12:58:10 UTC (rev 36273) @@ -0,0 +1,63 @@ +/******************************************************************************* + * Copyright (c) 2011 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.jboss.tools.hibernate3_5; + +import org.hibernate.console.execution.ExecutionContext; +import org.hibernate.console.ext.CompletionProposalsResult; +import org.hibernate.console.ext.HibernateException; +import org.hibernate.console.ext.HibernateExtension; +import org.hibernate.eclipse.console.ext.ConsoleExtension; +import org.hibernate.tool.ide.completion.HQLCodeAssist; +import org.hibernate.tool.ide.completion.IHQLCodeAssist; + +/** + * @author Dmitry Geraskov + * + */ +public class ConsoleExtension3_5 implements ConsoleExtension { + + private HibernateExtension3_5 hibernateExtension; + + public ConsoleExtension3_5(){} + + public void setHibernateException(HibernateExtension hibernateExtension){ + this.hibernateExtension = (HibernateExtension3_5) hibernateExtension; + } + + @Override + public CompletionProposalsResult hqlCodeComplete(String query, int currentOffset) { + EclipseHQLCompletionRequestor requestor = new EclipseHQLCompletionRequestor(); + if (!hibernateExtension.hasConfiguration()){ + try { + hibernateExtension.build(); + hibernateExtension.execute( new ExecutionContext.Command() { + public Object execute() { + if(hibernateExtension.hasConfiguration()) { + hibernateExtension.getConfiguration().buildMappings(); + } + return null; + } + }); + } catch (HibernateException e){ + //FIXME + //String mess = NLS.bind(HibernateConsoleMessages.CompletionHelper_error_could_not_build_cc, consoleConfiguration.getName()); + //HibernateConsolePlugin.getDefault().logErrorMessage(mess, e); + } + } + IHQLCodeAssist hqlEval = new HQLCodeAssist(hibernateExtension.getConfiguration()); + query = query.replace('\t', ' '); + hqlEval.codeComplete(query, currentOffset, requestor); + return new CompletionProposalsResult(requestor.getCompletionProposals(), requestor.getLastErrorMessage()); + } + + + +} Added: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/EclipseHQLCompletionRequestor.java =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/EclipseHQLCompletionRequestor.java (rev 0) +++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/EclipseHQLCompletionRequestor.java 2011-11-10 12:58:10 UTC (rev 36273) @@ -0,0 +1,151 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.tools.hibernate3_5; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.jface.text.contentassist.ICompletionProposal; +import org.eclipse.swt.graphics.Image; +import org.hibernate.console.ImageConstants; +import org.hibernate.eclipse.console.utils.EclipseImages; +import org.hibernate.eclipse.console.workbench.HibernateWorkbenchHelper; +import org.hibernate.tool.ide.completion.HQLCompletionProposal; +import org.hibernate.tool.ide.completion.IHQLCompletionRequestor; +import org.hibernate.util.StringHelper; + +public class EclipseHQLCompletionRequestor implements IHQLCompletionRequestor { + + private final List<ICompletionProposal> result = new ArrayList<ICompletionProposal>(); + private String lastErrorMessage; + private final int virtualOffset; + + public EclipseHQLCompletionRequestor() { + virtualOffset = 0; + } + + public EclipseHQLCompletionRequestor(int virtualOffset) { + this.virtualOffset = virtualOffset; + } + + public List<ICompletionProposal> getCompletionProposals() { + return result; + } + + public boolean accept(HQLCompletionProposal proposal) { + result.add(new CompletionProposal(proposal.getCompletion(), // replacementString + proposal.getReplaceStart()+virtualOffset, // replacementOffset + proposal.getReplaceEnd()-proposal.getReplaceStart(), // replacementLength + proposal.getCompletion().length(), // cursorPosition (relativeTo replacementStart) + getImage(proposal), + getDisplayString(proposal), + null, + null)); + return true; + } + + private String getDisplayString(HQLCompletionProposal proposal) { + StringBuffer buf = new StringBuffer(proposal.getSimpleName()); + + switch(proposal.getCompletionKind()) { + case HQLCompletionProposal.ENTITY_NAME: + if(proposal.getEntityName()!=null && + !(proposal.getSimpleName().equals( proposal.getEntityName()))) { + buf.append(" - "); //$NON-NLS-1$ + buf.append(StringHelper.qualifier( proposal.getEntityName() )); + } else if(proposal.getShortEntityName()!=null && + !(proposal.getSimpleName().equals( proposal.getEntityName()))) { + buf.append( " - " + proposal.getShortEntityName() ); //$NON-NLS-1$ + } + break; + case HQLCompletionProposal.ALIAS_REF: + if(proposal.getShortEntityName()!=null) { + buf.append( " - " + proposal.getShortEntityName() ); //$NON-NLS-1$ + } else if(proposal.getEntityName()!=null) { + buf.append( " - " + proposal.getEntityName() ); //$NON-NLS-1$ + } + break; + case HQLCompletionProposal.PROPERTY: + if(proposal.getShortEntityName()!=null) { + buf.append( " - " + proposal.getShortEntityName() ); //$NON-NLS-1$ + } else if(proposal.getEntityName()!=null) { + if(proposal.getEntityName().indexOf( "." )>=0) { //$NON-NLS-1$ + buf.append( " - " + StringHelper.unqualify( proposal.getEntityName() )); //$NON-NLS-1$ + } else { + buf.append( " - " + proposal.getEntityName() ); //$NON-NLS-1$ + } + } + break; + case HQLCompletionProposal.KEYWORD: + break; + case HQLCompletionProposal.FUNCTION: + break; + default: + + } + + + return buf.toString(); + } + + private Image getImage(HQLCompletionProposal proposal) { + String key = null; + + switch(proposal.getCompletionKind()) { + case HQLCompletionProposal.ENTITY_NAME: + case HQLCompletionProposal.ALIAS_REF: + key = ImageConstants.MAPPEDCLASS; + break; + case HQLCompletionProposal.PROPERTY: + if(proposal.getProperty()!=null) { + return HibernateWorkbenchHelper.getImage( proposal.getProperty() ); + } else { + key = ImageConstants.PROPERTY; + } + break; + case HQLCompletionProposal.KEYWORD: + key = null; + break; + case HQLCompletionProposal.FUNCTION: + key = ImageConstants.FUNCTION; + break; + default: + key = null; + } + + return key==null?null:EclipseImages.getImage( key ); + } + + public void completionFailure(String errorMessage) { + lastErrorMessage = errorMessage; + } + + public String getLastErrorMessage() { + return lastErrorMessage; + } + + public void clear() { + result.clear(); + lastErrorMessage = null; + } + +} Modified: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java 2011-11-10 11:02:27 UTC (rev 36272) +++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java 2011-11-10 12:58:10 UTC (rev 36273) @@ -33,7 +33,6 @@ import org.hibernate.console.ext.QueryResultImpl; import org.hibernate.console.preferences.ConsoleConfigurationPreferences; import org.hibernate.console.preferences.PreferencesClassPathUtils; -import org.hibernate.eclipse.hqleditor.EclipseHQLCompletionRequestor; import org.hibernate.eclipse.libs.FakeDelegatingDriver; import org.hibernate.tool.ide.completion.HQLCodeAssist; import org.hibernate.tool.ide.completion.IHQLCodeAssist; @@ -260,29 +259,10 @@ return configuration != null; } - @Override - public CompletionProposalsResult hqlCodeComplete(String query, int currentOffset) { - EclipseHQLCompletionRequestor requestor = new EclipseHQLCompletionRequestor(); - if (!hasConfiguration()){ - try { - build(); - execute( new ExecutionContext.Command() { - public Object execute() { - if(hasConfiguration()) { - configuration.buildMappings(); - } - return null; - } - }); - } catch (HibernateException e){ - //FIXME - //String mess = NLS.bind(HibernateConsoleMessages.CompletionHelper_error_could_not_build_cc, consoleConfiguration.getName()); - //HibernateConsolePlugin.getDefault().logErrorMessage(mess, e); - } - } - IHQLCodeAssist hqlEval = new HQLCodeAssist(configuration); - query = query.replace('\t', ' '); - hqlEval.codeComplete(query, currentOffset, requestor); - return new CompletionProposalsResult(requestor.getCompletionProposals(), requestor.getLastErrorMessage()); + /** + * @return + */ + public Configuration getConfiguration() { + return configuration; } } Modified: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF 2011-11-10 11:02:27 UTC (rev 36272) +++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/META-INF/MANIFEST.MF 2011-11-10 12:58:10 UTC (rev 36273) @@ -4,6 +4,7 @@ Bundle-SymbolicName: org.jboss.tools.hibernateextension4_0;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.jboss.tools.hibernate4_0.HibernateExtension4_0Plugin +Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.hibernate.eclipse;bundle-version="3.4.0", Modified: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/build.properties =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/build.properties 2011-11-10 11:02:27 UTC (rev 36272) +++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/build.properties 2011-11-10 12:58:10 UTC (rev 36273) @@ -30,4 +30,5 @@ lib/optional/proxool/hibernate-proxool-4.0.0.CR3.jar,\ lib/optional/proxool/proxool-0.8.3.jar,\ lib/bsh-core-2.0b4.jar,\ - lib/tools/hibernate-tools-3.5.0.Alpha.jar + lib/tools/hibernate-tools-3.5.0.Alpha.jar,\ + plugin.properties Added: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/plugin.properties =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/plugin.properties (rev 0) +++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/plugin.properties 2011-11-10 12:58:10 UTC (rev 36273) @@ -0,0 +1 @@ +hibernate.version=4.0 \ No newline at end of file Modified: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/plugin.xml =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/plugin.xml 2011-11-10 11:02:27 UTC (rev 36272) +++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/plugin.xml 2011-11-10 12:58:10 UTC (rev 36273) @@ -5,8 +5,15 @@ point="org.hibernate.eclipse.hibernateextension"> <hibernateextension classname="org.jboss.tools.hibernate4_0.HibernateExtension4_0" - version="4.0"> + version="%hibernate.version"> </hibernateextension> </extension> + <extension + point="org.hibernate.eclipse.console.consoleextension"> + <consoleextension + classname="org.jboss.tools.hibernate4_0.ConsoleExtension4_0" + version="%hibernate.version"> + </consoleextension> + </extension> </plugin> Added: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/ConsoleExtension4_0.java =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/ConsoleExtension4_0.java (rev 0) +++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/ConsoleExtension4_0.java 2011-11-10 12:58:10 UTC (rev 36273) @@ -0,0 +1,63 @@ +/******************************************************************************* + * Copyright (c) 2011 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.jboss.tools.hibernate4_0; + +import org.hibernate.console.execution.ExecutionContext; +import org.hibernate.console.ext.CompletionProposalsResult; +import org.hibernate.console.ext.HibernateException; +import org.hibernate.console.ext.HibernateExtension; +import org.hibernate.eclipse.console.ext.ConsoleExtension; +import org.hibernate.tool.ide.completion.HQLCodeAssist; +import org.hibernate.tool.ide.completion.IHQLCodeAssist; + +/** + * @author Dmitry Geraskov + * + */ +public class ConsoleExtension4_0 implements ConsoleExtension { + + private HibernateExtension4_0 hibernateExtension; + + public ConsoleExtension4_0(){} + + public void setHibernateException(HibernateExtension hibernateExtension){ + this.hibernateExtension = (HibernateExtension4_0) hibernateExtension; + } + + @Override + public CompletionProposalsResult hqlCodeComplete(String query, int currentOffset) { + EclipseHQLCompletionRequestor requestor = new EclipseHQLCompletionRequestor(); + if (!hibernateExtension.hasConfiguration()){ + try { + hibernateExtension.build(); + hibernateExtension.execute( new ExecutionContext.Command() { + public Object execute() { + if(hibernateExtension.hasConfiguration()) { + hibernateExtension.getConfiguration().buildMappings(); + } + return null; + } + }); + } catch (HibernateException e){ + //FIXME + //String mess = NLS.bind(HibernateConsoleMessages.CompletionHelper_error_could_not_build_cc, consoleConfiguration.getName()); + //HibernateConsolePlugin.getDefault().logErrorMessage(mess, e); + } + } + IHQLCodeAssist hqlEval = new HQLCodeAssist(hibernateExtension.getConfiguration()); + query = query.replace('\t', ' '); + hqlEval.codeComplete(query, currentOffset, requestor); + return new CompletionProposalsResult(requestor.getCompletionProposals(), requestor.getLastErrorMessage()); + } + + + +} Modified: branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java =================================================================== --- branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java 2011-11-10 11:02:27 UTC (rev 36272) +++ branches/dead/hibernatetools-multiversion2/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java 2011-11-10 12:58:10 UTC (rev 36273) @@ -311,30 +311,11 @@ return configuration != null; } - @Override - public CompletionProposalsResult hqlCodeComplete(String query, int currentOffset) { - EclipseHQLCompletionRequestor requestor = new EclipseHQLCompletionRequestor(); - if (!hasConfiguration()){ - try { - build(); - execute( new ExecutionContext.Command() { - public Object execute() { - if(hasConfiguration()) { - configuration.buildMappings(); - } - return null; - } - }); - } catch (HibernateException e){ - //FIXME - //String mess = NLS.bind(HibernateConsoleMessages.CompletionHelper_error_could_not_build_cc, consoleConfiguration.getName()); - //HibernateConsolePlugin.getDefault().logErrorMessage(mess, e); - } - } - IHQLCodeAssist hqlEval = new HQLCodeAssist(configuration); - query = query.replace('\t', ' '); - hqlEval.codeComplete(query, currentOffset, requestor); - return new CompletionProposalsResult(requestor.getCompletionProposals(), requestor.getLastErrorMessage()); + /** + * @return + */ + public Configuration getConfiguration() { + return configuration; } } \ No newline at end of file