Skip to content

Commit

Permalink
Merge pull request eclipse-birt#766 from claesrosell/Replace_deprecat…
Browse files Browse the repository at this point in the history
…ed_Navigator_with_Project_Explorer_in_Report_Design_perspective_#710

Replace deprecated Navigator with Project Explorer in Report Design
  • Loading branch information
ruspl-afed authored Jan 23, 2022
2 parents 243dfe9 + 991743c commit 2ea2b20
Show file tree
Hide file tree
Showing 19 changed files with 706 additions and 942 deletions.
103 changes: 33 additions & 70 deletions UI/org.eclipse.birt.report.debug.ui/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -211,76 +211,31 @@
menubarPath="debug">
</action>
</viewerContribution>
<viewerContribution
id="org.eclipse.birt.report.designer.ui.ide.Report"
targetID="org.eclipse.ui.views.ResourceNavigator">
<menu
id="org.eclipse.birt.report.designer.ui.ide.Report"
label="%Menu.Report"
path="additions">
<groupMarker
name="report">
</groupMarker>
</menu>
<visibility>
<or>
<and>
<objectClass
name="org.eclipse.core.resources.IFile">
</objectClass>
<objectState
name="contentTypeId"
value="org.eclipse.birt.report.designer.ui.editors.reportdesign">
</objectState>
</and>
<and>
<objectClass
name="org.eclipse.core.resources.IFile">
</objectClass>
<objectState
name="contentTypeId"
value="org.eclipse.birt.report.designer.ui.editors.reporttemplate">
</objectState>
</and>
</or>
</visibility>
</viewerContribution>
<viewerContribution
id="org.eclipse.Script.debug.ui.DebugResourceAction"
targetID="org.eclipse.ui.views.ResourceNavigator">
<action
class="org.eclipse.birt.report.debug.internal.ui.script.actions.DebugResourceAction"
enablesFor="1"
icon="icons/full/ctool16/birtdebugger.gif"
id="org.eclipse.Script.debug.ui.DebugResource"
label="%Action.DebugReport"
menubarPath="org.eclipse.birt.report.designer.ui.ide.Report/report">
</action>
<visibility>
<or>
<and>
<objectClass
name="org.eclipse.core.resources.IFile">
</objectClass>
<objectState
name="contentTypeId"
value="org.eclipse.birt.report.designer.ui.editors.reportdesign">
</objectState>
</and>
<and>
<objectClass
name="org.eclipse.core.resources.IFile">
</objectClass>
<objectState
name="contentTypeId"
value="org.eclipse.birt.report.designer.ui.editors.reporttemplate">
</objectState>
</and>
</or>
</visibility>
</viewerContribution>
</extension>

</extension>

<extension point="org.eclipse.ui.menus">
<menuContribution locationURI="popup:org.eclipse.birt.report.designer.ui.ide.reportMenu">
<command commandId="org.eclipse.birt.report.designer.ui.ide.debugReport.command"
label="%Action.DebugReport"
icon="icons/full/ctool16/birtdebugger.gif"
style="push">

<visibleWhen>
<with variable="selection">
<iterate operator="or" ifEmpty="false">
<adapt type="org.eclipse.core.resources.IResource">
<or>
<test property="org.eclipse.core.resources.contentTypeId" value="org.eclipse.birt.report.designer.ui.editors.reporttemplate" />
<test property="org.eclipse.core.resources.contentTypeId" value="org.eclipse.birt.report.designer.ui.editors.reportdesign" />
</or>
</adapt>
</iterate>
</with>
</visibleWhen>
</command>
</menuContribution>
</extension>

<extension point="org.eclipse.jdt.launching.classpathProviders">
<classpathProvider
id="org.eclipse.birt.report.debug.script.ScriptDebugClasspathProvider"
Expand Down Expand Up @@ -422,4 +377,12 @@
</part>
</actionSetPartAssociation>
</extension>

<extension point="org.eclipse.ui.commands">
<command id="org.eclipse.birt.report.designer.ui.ide.debugReport.command" name="%Action.DebugReport"/>
</extension>

<extension point="org.eclipse.ui.handlers">
<handler commandId="org.eclipse.birt.report.designer.ui.ide.debugReport.command" class="org.eclipse.birt.report.debug.internal.ui.script.handlers.DebugResourceHandler"/>
</extension>
</plugin>

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/*******************************************************************************
* Copyright (c) 2008 Actuate Corporation.
* All rights reserved. This program and the accompanying materials
* are 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
*
* Contributors:
* Actuate Corporation - initial API and implementation
*******************************************************************************/

package org.eclipse.birt.report.debug.internal.ui.script.handlers;

import org.eclipse.birt.report.debug.internal.ui.script.launcher.ScriptLaunchShortcut;
import org.eclipse.core.commands.AbstractHandler;
import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.expressions.IEvaluationContext;
import org.eclipse.core.resources.IFile;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.ui.DebugUITools;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.ISources;

/**
* Add the debug report action in the navigate view
*/

public class DebugResourceHandler extends AbstractHandler {

protected IFile selectedFile;

@Override
public void setEnabled(Object evaluationContext) {

this.selectedFile = null;

if ((evaluationContext instanceof IEvaluationContext)) {
IEvaluationContext context = (IEvaluationContext) evaluationContext;
Object object = context.getVariable(ISources.ACTIVE_CURRENT_SELECTION_NAME);
if (object instanceof IStructuredSelection) {
IStructuredSelection selection = (IStructuredSelection) object;
if (selection.size() == 1 && selection.getFirstElement() instanceof IFile) {
this.selectedFile = (IFile) selection.getFirstElement();
}
}
}

this.setBaseEnabled(this.selectedFile != null);
}

@Override
public Object execute(ExecutionEvent event) throws ExecutionException {

if (this.selectedFile != null) {
String fileName = this.selectedFile.getLocation().toOSString();
ILaunchConfiguration config = ScriptLaunchShortcut.findLaunchConfiguration(fileName,
ScriptLaunchShortcut.getConfigurationType());
if (config != null) {
DebugUITools.launch(config, "debug");//$NON-NLS-1$
}
}

return null;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.variables;bundle-version="3.2.100"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-11
Import-Package: com.ibm.icu.text;version="3.4.4"
Import-Package: com.ibm.icu.text;version="3.4.4",
org.eclipse.core.expressions
Automatic-Module-Name: org.eclipse.birt.report.designer.ui.ide
Loading

0 comments on commit 2ea2b20

Please sign in to comment.