Commit 9b947997 authored by Markus Krug's avatar Markus Krug

increased dependencies for ATHEN

parent 2324e537
Pipeline #9973 passed with stages
in 23 minutes
......@@ -57,7 +57,7 @@ public class SearchDialog {
* @param parent
* Shell The shell that is the parent of the dialog.
*/
public SearchDialog(Shell parent, String selectedText) {
public SearchDialog(Shell parent) {
shell = new Shell(parent, SWT.CLOSE | SWT.BORDER | SWT.TITLE);
GridLayout layout = new GridLayout();
......@@ -77,7 +77,6 @@ public class SearchDialog {
GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
gridData.widthHint = 200;
searchText.setLayoutData(gridData);
searchText.setText(selectedText);
searchText.addModifyListener(new ModifyListener() {
public void modifyText(ModifyEvent e) {
boolean enableFind = searchText.getCharCount() != 0;
......@@ -166,6 +165,14 @@ public class SearchDialog {
findHandler = listener;
}
public void hide() {
this.shell.setVisible(false);
}
public void show() {
this.shell.setVisible(true);
}
public boolean getMatchCase() {
return matchCase.getSelection();
}
......@@ -205,6 +212,10 @@ public class SearchDialog {
public void removeFindListener(FindListener listener) {
findHandler = null;
}
public void putFocus(){
searchText.setFocus();
}
public void setMatchCase(boolean match) {
matchCase.setSelection(match);
......
......@@ -132,6 +132,7 @@ public class AnnotationEditorWidget extends Composite {
private StyleDataStructure styleStruct;
private TypeSystem typeSystem;
private SearchDialog sd;
protected boolean mousedrag;
private boolean isDirty;
......@@ -268,6 +269,11 @@ public class AnnotationEditorWidget extends Composite {
visibleTypesOld.clear();
}
}
//update search dialog
if(sd!=null){
sd.addFindListener(new EditorFindHandler(getWidget(), sd, AnnotationEditorWidget.this));
}
if (this.cas != null) {
this.cas.release();
......@@ -587,12 +593,20 @@ public class AnnotationEditorWidget extends Composite {
public void keyPressed(KeyEvent e) {
if (((e.stateMask & SWT.CTRL) == SWT.CTRL) && (e.keyCode == 'f')) {
// open search dialog
SearchDialog sd = new SearchDialog(Display.getCurrent().getActiveShell(),
widget.getSelectionText() != null ? widget.getSelectionText() : "");
if (sd == null) {
sd = new SearchDialog(Display.getCurrent().getActiveShell());
sd.open();
sd.hide();
}
sd.addFindListener(new EditorFindHandler(getWidget(), sd, AnnotationEditorWidget.this));
sd.open();
String input = widget.getSelectionText() != null ? widget.getSelectionText() : "";
sd.setSearchString(input);
sd.show();
sd.putFocus();
}
if (((e.stateMask & SWT.CTRL) == SWT.CTRL)) {
......@@ -1138,8 +1152,8 @@ public class AnnotationEditorWidget extends Composite {
// TODO the anno browser labelprovider color seems off!!
StyleRange srAnnoType = new StyleRange();
srAnnoType.background=actual;
srAnnoType.foreground=actual;
srAnnoType.background = actual;
srAnnoType.foreground = actual;
AnnoStyle style = new AnnoStyle(DrawingTypeStrategyFactory.getNaiveSpanDrawingStrategy(next,
actual.getRGBA(), actual.getRGBA(), EDrawingType.RECTANGLE_FILLED), srAnnoType);
// AnnoStyle style = new AnnoStyle(strat, styleRange);
......@@ -1264,7 +1278,7 @@ public class AnnotationEditorWidget extends Composite {
public void run() {
System.out.println("search");
SearchDialog sd = new SearchDialog(getParent().getShell(), getWidget().getSelectionText());
SearchDialog sd = new SearchDialog(getParent().getShell());
sd.addFindListener(new EditorFindHandler(getWidget(), sd, AnnotationEditorWidget.this));
sd.open();
......
......@@ -33,7 +33,6 @@
<vm>
</vm>
<plugins>
<plugin id="com.ibm.icu"/>
<plugin id="de.uniwue.mk.kall.athen.annotationbrowserview"/>
......@@ -321,9 +320,6 @@
</plugins>
<features>
<feature id="org.eclipse.emf.ecore"/>
<feature id="org.eclipse.emf.common"/>
<feature id="org.eclipse.fx.target.rcp4.feature"/>
<feature id="org.eclipse.equinox.p2.rcp.feature"/>
<feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
<feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
......@@ -335,12 +331,14 @@
<feature id="org.eclipse.equinox.p2.extras.feature"/>
<feature id="org.eclipse.platform"/>
<feature id="org.eclipse.equinox.p2.user.ui"/>
<feature id="org.eclipse.help"/>
<feature id="org.eclipse.rcp"/>
<feature id="org.eclipse.jdt"/>
<feature id="org.eclipse.equinox.core.sdk"/>
<feature id="org.eclipse.e4.rcp"/>
<feature id="de.uniwue.mk.athen.feature"/>
<feature id="org.eclipse.emf.ecore"/>
<feature id="org.eclipse.help"/>
<feature id="org.eclipse.emf.common"/>
<feature id="org.eclipse.jdt"/>
</features>
<configurations>
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?><target name="de.uniwue.mk.athen.target" sequenceNumber="43">
<?pde version="3.8"?><target name="de.uniwue.mk.athen.target" sequenceNumber="45">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.fx.target.rcp4.feature.feature.group" version="2.0.0.201506240602"/>
<repository location="http://download.eclipse.org/efxclipse/runtime-released/2.0.0/site"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.platform.ide" version="4.6.0.I20160606-1100"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.12.0.v20160606-1311"/>
<unit id="org.eclipse.jdt.feature.group" version="3.12.0.v20160606-1100"/>
<unit id="org.eclipse.pde.source.feature.group" version="3.12.0.v20160606-1100"/>
<unit id="org.eclipse.pde.feature.group" version="3.12.0.v20160606-1100"/>
<unit id="org.eclipse.jdt.source.feature.group" version="3.12.0.v20160606-1100"/>
<unit id="org.eclipse.rcp.source.feature.group" version="4.6.0.v20160606-1342"/>
<unit id="org.eclipse.platform.sdk" version="4.6.0.I20160606-1100"/>
<unit id="org.eclipse.rcp.feature.group" version="4.6.0.v20160606-1342"/>
<unit id="org.eclipse.sdk.ide" version="4.6.0.I20160606-1100"/>
<unit id="org.eclipse.releng.tools.feature.group" version="3.9.0.v20160424-1559"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.6"/>
<unit id="org.eclipse.equinox.sdk.feature.group" version="3.13.4.v20180322-2228"/>
<unit id="org.eclipse.sdk.ide" version="4.7.3.M20180330-0640"/>
<unit id="org.eclipse.swt.tools.feature.feature.group" version="3.106.0.v20170503-0851"/>
<unit id="org.eclipse.sdk.tests.feature.group" version="4.7.3.v20180330-0919"/>
<unit id="org.eclipse.rcp.source.feature.group" version="4.7.3.v20180330-0640"/>
<unit id="org.eclipse.platform.sdk" version="4.7.3.M20180330-0640"/>
<unit id="org.eclipse.pde.api.tools.ee.feature.feature.group" version="1.0.200.v20170515-0910"/>
<unit id="org.eclipse.rcp.feature.group" version="4.7.3.v20180330-0640"/>
<unit id="org.eclipse.osgi.compatibility.plugins.feature.feature.group" version="1.1.1.v20170811-1325"/>
<unit id="org.eclipse.test.feature.group" version="3.7.200.v20170511-1043"/>
<unit id="org.eclipse.e4.core.tools.feature.source.feature.group" version="4.7.0.v20170515-1617"/>
<unit id="org.eclipse.pde.feature.group" version="3.13.4.v20180330-0640"/>
<unit id="org.eclipse.releng.tools.feature.group" version="3.9.100.v20170516-0717"/>
<unit id="org.eclipse.pde.source.feature.group" version="3.13.4.v20180330-0640"/>
<unit id="org.eclipse.platform.ide" version="4.7.3.M20180330-0640"/>
<unit id="org.eclipse.sdk.examples.source.feature.group" version="3.6.4.v20180330-0640"/>
<repository location="http://download.eclipse.org/eclipse/updates/4.7"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.apache.commons.lang" version="2.6.0"/>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment