Skip to content

Inline xtext.common.types.shared.jdt38 into xtext.xbase.ui #3729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HannesWell wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Inline xtext.common.types.shared.jdt38 into xtext.xbase.ui #3729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions org.eclipse.xtend.ide.swtbot.tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,6 @@
<id>org.eclipse.jdt</id>
<versionRange>1.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.xtext.common.types.shared.jdt38</id>
<versionRange>1.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.xtext.logging</id>
Expand Down
5 changes: 0 additions & 5 deletions org.eclipse.xtend.tycho.tests.parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,6 @@
<id>org.eclipse.jdt</id>
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.xtext.common.types.shared.jdt38</id>
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
<type>eclipse-plugin</type>
<id>org.eclipse.xtext.logging</id>
Expand Down
7 changes: 0 additions & 7 deletions org.eclipse.xtext.common.types.shared.jdt38/.classpath
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion org.eclipse.xtext.common.types.shared.jdt38/.gitignore
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions org.eclipse.xtext.common.types.shared.jdt38/.project
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions ...common.types.shared.jdt38/.settings/gradle/org.springsource.ide.eclipse.gradle.core.prefs
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions org.eclipse.xtext.common.types.shared.jdt38/.settings/org.eclipse.core.resources.prefs
View file
Open in desktop

This file was deleted.

372 changes: 0 additions & 372 deletions org.eclipse.xtext.common.types.shared.jdt38/.settings/org.eclipse.jdt.core.prefs
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions org.eclipse.xtext.common.types.shared.jdt38/.settings/org.eclipse.jdt.ui.prefs
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions org.eclipse.xtext.common.types.shared.jdt38/.settings/org.eclipse.pde.prefs
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions org.eclipse.xtext.common.types.shared.jdt38/META-INF/MANIFEST.MF
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions org.eclipse.xtext.common.types.shared.jdt38/about.html
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions org.eclipse.xtext.common.types.shared.jdt38/build.properties
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions org.eclipse.xtext.common.types.shared.jdt38/fragment.properties
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions org.eclipse.xtext.common.types.shared.jdt38/fragment.xml
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions org.eclipse.xtext.common.types.shared.jdt38/pom.xml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion org.eclipse.xtext.full.releng/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@
<module>../org.eclipse.xtext.common.types.ui</module>
<module>../org.eclipse.xtext.common.types.edit</module>
<module>../org.eclipse.xtext.common.types.shared</module>
<module>../org.eclipse.xtext.common.types.shared.jdt38</module>
<module>../org.eclipse.xtext.m2e</module>
<module>../org.eclipse.xtext.ui.shared</module>
<module>../org.eclipse.xtext.xbase.ui</module>
Expand Down
20 changes: 2 additions & 18 deletions org.eclipse.xtext.redist.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<copyright>
Copyright (c) 2009, 2018 itemis AG (http://www.itemis.eu) and others.

This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
which is available at http://www.eclipse.org/legal/epl-2.0.

SPDX-License-Identifier: EPL-2.0
Expand Down Expand Up @@ -197,22 +197,6 @@ SPDX-License-Identifier: EPL-2.0
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.xtext.common.types.shared.jdt38"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>

<plugin
id="org.eclipse.xtext.common.types.shared.jdt38.source"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>

<plugin
id="org.eclipse.xtext.ui.shared"
download-size="0"
Expand Down
20 changes: 2 additions & 18 deletions org.eclipse.xtext.ui.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<copyright>
Copyright (c) 2009, 2018 itemis AG (http://www.itemis.eu) and others.

This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
which is available at http://www.eclipse.org/legal/epl-2.0.

SPDX-License-Identifier: EPL-2.0
Expand Down Expand Up @@ -71,22 +71,6 @@ SPDX-License-Identifier: EPL-2.0
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.xtext.common.types.shared.jdt38"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>

<plugin
id="org.eclipse.xtext.common.types.shared.jdt38.source"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>

<plugin
id="org.eclipse.xtext.ui.shared"
download-size="0"
Expand Down
7 changes: 7 additions & 0 deletions org.eclipse.xtext.xbase.ui/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,4 +174,11 @@
</enablement>
</detailFactories>
</extension>
<extension
point="org.eclipse.ui.ide.editorAssociationOverride">
<editorAssociationOverride
class="org.eclipse.xtext.xbase.ui.XbaseExecutableExtensionFactory:org.eclipse.xtext.xbase.ui.editor.OriginalEditorSelector"
id="xtext.common.types.originalEditorSelector">
</editorAssociationOverride>
</extension>
</plugin>
12 changes: 7 additions & 5 deletions ...pes/shared/jdt38/DebugPluginListener.java → .../xbase/ui/editor/DebugPluginListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
*
* SPDX-License-Identifier: EPL-2.0
*******************************************************************************/
package org.eclipse.xtext.common.types.shared.jdt38;
package org.eclipse.xtext.xbase.ui.editor;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;

import org.apache.log4j.Logger;
Expand All @@ -21,13 +23,12 @@
import org.eclipse.jdt.debug.core.IJavaThread;
import org.eclipse.xtext.util.Strings;

import com.google.common.collect.Lists;
import com.google.inject.Singleton;

@Singleton
public class DebugPluginListener implements IDebugEventSetListener {

private static Logger log = Logger.getLogger(DebugPluginListener.class);
private static final Logger log = Logger.getLogger(DebugPluginListener.class);

public DebugPluginListener() {
DebugPlugin.getDefault().addDebugEventListener(this);
Expand All @@ -37,6 +38,7 @@ public DebugPluginListener() {

private IStackFrame lastFrame;

@Override
public void handleDebugEvents(DebugEvent[] events) {
for (DebugEvent event : events) {
Object source = event.getSource();
Expand Down Expand Up @@ -66,11 +68,11 @@ public String findXtextSourceFileNameForClassFile(String simpleFileName) {
String typename = simpleFileName.substring(0, simpleFileName.length() - ".class".length());
synchronized (this) {
try {
List<IStackFrame> frames = Lists.newArrayList();
List<IStackFrame> frames = new ArrayList<>();
if (lastFrame != null)
frames.add(lastFrame);
if (lastThread != null)
frames.addAll(Lists.newArrayList(lastThread.getStackFrames()));
frames.addAll(Arrays.asList(lastThread.getStackFrames()));
for (IStackFrame frame : frames)
if (frame instanceof IJavaStackFrame) {
IJavaStackFrame jsf = (IJavaStackFrame) frame;
Expand Down
Loading
Loading