diff options
9 files changed, 0 insertions, 426 deletions
diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/META-INF/MANIFEST.MF b/rpm/org.eclipse.linuxtools.rpm.ui.editor/META-INF/MANIFEST.MF index 87d6cbea3a..397f5fdeb6 100644 --- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/META-INF/MANIFEST.MF +++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/META-INF/MANIFEST.MF @@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.ui.console, org.eclipse.linuxtools.changelog.core, com.ibm.icu, - org.eclipse.ui.forms;bundle-version="3.3.101", org.eclipse.compare;bundle-version="3.4.0", org.eclipse.linuxtools.rpm.core, org.eclipse.ui.console, diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/plugin.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor/plugin.properties index 6617bfb07c..b6aedaacdb 100644 --- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/plugin.properties +++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/plugin.properties @@ -12,7 +12,6 @@ bundleName=RPM Specfile Editor provider=Eclipse Linux Tools context.name = Specfile Editor Context editor.name = Specfile Editor -editor.name.0 = Specfile Form Editor extension.name = Specfile Error Marker extension.name.0 = Specfile Task Marker page.name = Specfile Editor diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/plugin.xml b/rpm/org.eclipse.linuxtools.rpm.ui.editor/plugin.xml index 51079f94c0..2d46afe592 100644 --- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/plugin.xml +++ b/rpm/org.eclipse.linuxtools.rpm.ui.editor/plugin.xml @@ -53,16 +53,6 @@ contentTypeId="org.eclipse.linuxtools.rpm.editor.content-type"> </contentTypeBinding> </editor> - <editor - name="%editor.name.0" - icon="icons/rpm.gif" - contributorClass="org.eclipse.ui.texteditor.BasicTextEditorActionContributor" - class="org.eclipse.linuxtools.internal.rpm.ui.editor.forms.SpecfileFormEditor" - id="org.eclipse.linuxtools.rpm.ui.editor.forms.SpecfileFormEditor"> - <contentTypeBinding - contentTypeId="org.eclipse.linuxtools.rpm.editor.content-type"> - </contentTypeBinding> - </editor> </extension> <extension point="org.eclipse.ui.genericeditor.presentationReconcilers"> diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/forms/MainPackagePage.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/forms/MainPackagePage.java deleted file mode 100644 index 553f44346e..0000000000 --- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/forms/MainPackagePage.java +++ /dev/null @@ -1,161 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2016 Red Hat, Inc. - * 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: - * Red Hat - initial API and implementation - *******************************************************************************/ -package org.eclipse.linuxtools.internal.rpm.ui.editor.forms; - -import org.eclipse.linuxtools.internal.rpm.ui.editor.RpmTags; -import org.eclipse.linuxtools.internal.rpm.ui.editor.parser.SpecfileTag; -import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile; -import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfilePackage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.layout.RowLayout; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.ui.forms.IManagedForm; -import org.eclipse.ui.forms.editor.FormPage; -import org.eclipse.ui.forms.widgets.ExpandableComposite; -import org.eclipse.ui.forms.widgets.FormToolkit; -import org.eclipse.ui.forms.widgets.ScrolledForm; -import org.eclipse.ui.forms.widgets.Section; - -public class MainPackagePage extends FormPage { - private Specfile specfile; - - public MainPackagePage(SpecfileFormEditor editor, Specfile specfile) { - super(editor, Messages.MainPackagePage_0, Messages.MainPackagePage_1); - this.specfile = specfile; - } - - @Override - protected void createFormContent(IManagedForm managedForm) { - super.createFormContent(managedForm); - FormToolkit toolkit = managedForm.getToolkit(); - ScrolledForm form = managedForm.getForm(); - form.setText(Messages.MainPackagePage_2); - GridLayout layout = new GridLayout(); - layout.marginWidth = layout.marginHeight = 5; - layout.numColumns = 2; - RowLayout rowLayout = new RowLayout(); - rowLayout.type = SWT.VERTICAL; - rowLayout.justify = true; - rowLayout.fill = true; - - form.getBody().setLayout(rowLayout); - form.getBody().setLayoutData(rowLayout); - layout.numColumns = 2; - GridData gd = new GridData(); - gd.horizontalSpan = 2; - gd.horizontalAlignment = SWT.FILL; - final Section mainPackageSection = toolkit.createSection(form.getBody(), - ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); - mainPackageSection.setText(Messages.MainPackagePage_3); - mainPackageSection.setLayout(new GridLayout()); - Composite mainPackageClient = toolkit.createComposite(mainPackageSection); - GridLayout gridLayout = new GridLayout(); - gridLayout.marginWidth = gridLayout.marginHeight = 5; - gridLayout.numColumns = 2; - - mainPackageClient.setLayout(gridLayout); - new RpmTagText(mainPackageClient, RpmTags.NAME, specfile); - new RpmTagText(mainPackageClient, RpmTags.VERSION, specfile); - new RpmTagText(mainPackageClient, RpmTags.RELEASE, specfile); - new RpmTagText(mainPackageClient, RpmTags.URL, specfile); - new RpmTagText(mainPackageClient, RpmTags.LICENSE, specfile); - new RpmTagText(mainPackageClient, RpmTags.GROUP, specfile); - new RpmTagText(mainPackageClient, RpmTags.EPOCH, specfile); - new RpmTagText(mainPackageClient, RpmTags.BUILD_ROOT, specfile); - new RpmTagText(mainPackageClient, RpmTags.BUILD_ARCH, specfile); - new RpmTagText(mainPackageClient, RpmTags.SUMMARY, specfile, SWT.MULTI); - - // BuildRequires - final Section buildRequiresSection = toolkit.createSection(mainPackageClient, - ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); - buildRequiresSection.setText(Messages.MainPackagePage_4); - buildRequiresSection.setLayout(rowLayout); - buildRequiresSection.setExpanded(false); - Composite buildRequiresClient = toolkit.createComposite(buildRequiresSection); - buildRequiresClient.setLayout(gridLayout); - for (SpecfileTag buildRequire : specfile.getBuildRequires()) { - new RpmTagText(buildRequiresClient, buildRequire, specfile); - } - buildRequiresSection.setClient(buildRequiresClient); - toolkit.paintBordersFor(buildRequiresClient); - toolkit.paintBordersFor(buildRequiresSection); - - // Requires - final Section requiresSection = toolkit.createSection(mainPackageClient, - ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); - requiresSection.setText(Messages.MainPackagePage_5); - requiresSection.setLayout(rowLayout); - requiresSection.setExpanded(false); - Composite requiresClient = toolkit.createComposite(requiresSection); - requiresClient.setLayout(gridLayout); - requiresClient.setLayoutData(gd); - for (SpecfileTag require : specfile.getRequires()) { - new RpmTagText(requiresClient, require, specfile); - } - requiresSection.setClient(requiresClient); - toolkit.paintBordersFor(requiresClient); - toolkit.paintBordersFor(requiresSection); - - mainPackageSection.setClient(mainPackageClient); - toolkit.paintBordersFor(mainPackageClient); - toolkit.paintBordersFor(mainPackageSection); - - // subpackages - final Section packagesSection = toolkit.createSection(form.getBody(), - ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); - packagesSection.setText(Messages.MainPackagePage_6); - packagesSection.setLayout(gridLayout); - Composite packagesClient = toolkit.createComposite(packagesSection); - packagesClient.setLayout(gridLayout); - packagesClient.setLayoutData(gd); - for (SpecfilePackage specfilePackage : specfile.getPackages().getPackages()) { - if (specfilePackage.isMainPackage()) { - continue; - } - final Section packageSection = toolkit.createSection(packagesClient, - ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); - packageSection.setText(specfilePackage.getFullPackageName()); - packageSection.setExpanded(false); - packageSection.setLayout(rowLayout); - Composite packageClient = toolkit.createComposite(packageSection); - packageClient.setLayout(gridLayout); - packageClient.setLayoutData(gd); - new RpmTagText(packageClient, RpmTags.SUMMARY, specfile, specfilePackage, SWT.MULTI); - new RpmTagText(packageClient, RpmTags.GROUP, specfile, specfilePackage, SWT.MULTI); - - final Section packageRequiresSection = toolkit.createSection(packageClient, - ExpandableComposite.TITLE_BAR | ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED); - packageRequiresSection.setText(Messages.MainPackagePage_7); - packageRequiresSection.setLayout(rowLayout); - packageRequiresSection.setLayoutData(gd); - Composite packageRequiresClient = toolkit.createComposite(packageRequiresSection); - packageRequiresClient.setLayout(gridLayout); - packageRequiresClient.setLayoutData(gd); - for (SpecfileTag require : specfilePackage.getRequires()) { - new RpmTagText(packageRequiresClient, require, specfile); - } - packageRequiresSection.setClient(packageRequiresClient); - - toolkit.paintBordersFor(packageRequiresClient); - toolkit.paintBordersFor(packageRequiresSection); - - packageSection.setClient(packageClient); - toolkit.paintBordersFor(packageClient); - toolkit.paintBordersFor(packageSection); - } - packagesSection.setClient(packagesClient); - toolkit.paintBordersFor(packagesClient); - toolkit.paintBordersFor(packagesSection); - managedForm.refresh(); - } -} diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/forms/Messages.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/forms/Messages.java deleted file mode 100644 index a35b645cdb..0000000000 --- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/forms/Messages.java +++ /dev/null @@ -1,35 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Red Hat, Inc. - * 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: - * Red Hat - initial API and implementation - *******************************************************************************/ -package org.eclipse.linuxtools.internal.rpm.ui.editor.forms; - -import org.eclipse.osgi.util.NLS; - -public final class Messages extends NLS { - private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.rpm.ui.editor.forms.messages"; //$NON-NLS-1$ - public static String MainPackagePage_0; - public static String MainPackagePage_1; - public static String MainPackagePage_2; - public static String MainPackagePage_3; - public static String MainPackagePage_4; - public static String MainPackagePage_5; - public static String MainPackagePage_6; - public static String MainPackagePage_7; - public static String RpmTagText_0; - public static String SpecfileFormEditor_0; - static { - // initialize resource bundle - NLS.initializeMessages(BUNDLE_NAME, Messages.class); - } - - private Messages() { - super(); - } -} diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/forms/RpmSectionPage.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/forms/RpmSectionPage.java deleted file mode 100644 index 1f37ab8646..0000000000 --- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/forms/RpmSectionPage.java +++ /dev/null @@ -1,55 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 Red Hat, Inc. - * 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: - * Red Hat - initial API and implementation - *******************************************************************************/ -package org.eclipse.linuxtools.internal.rpm.ui.editor.forms; - -import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile; -import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileSection; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Text; -import org.eclipse.ui.forms.IManagedForm; -import org.eclipse.ui.forms.editor.FormPage; -import org.eclipse.ui.forms.widgets.FormToolkit; -import org.eclipse.ui.forms.widgets.ScrolledForm; - -public class RpmSectionPage extends FormPage { - private String rpmSection; - private SpecfileSection section; - - public RpmSectionPage(SpecfileFormEditor editor, Specfile specfile, - String rpmSection) { - super(editor, rpmSection, rpmSection); - this.rpmSection = rpmSection; - this.section = specfile.getSection(rpmSection.substring(1)); - } - - @Override - protected void createFormContent(IManagedForm managedForm) { - super.createFormContent(managedForm); - FormToolkit toolkit = managedForm.getToolkit(); - ScrolledForm form = managedForm.getForm(); - form.setText(rpmSection); - GridLayout layout = new GridLayout(); - - form.getBody().setLayout(layout); - layout.numColumns = 2; - toolkit.createLabel(form.getBody(), rpmSection); - final Text text = toolkit.createText(form.getBody(), section.getContents(), - SWT.MULTI | SWT.BORDER | SWT.V_SCROLL); - GridData gd = new GridData(); - gd.grabExcessHorizontalSpace = true; - gd.grabExcessVerticalSpace = true; - gd.horizontalAlignment = SWT.FILL; - gd.verticalAlignment = SWT.FILL; - text.setLayoutData(gd); - } -} diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/forms/RpmTagText.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/forms/RpmTagText.java deleted file mode 100644 index 2b651ea9dd..0000000000 --- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/forms/RpmTagText.java +++ /dev/null @@ -1,70 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009-2010 Red Hat, Inc. - * 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: - * Red Hat - initial API and implementation - *******************************************************************************/ -package org.eclipse.linuxtools.internal.rpm.ui.editor.forms; - -import org.eclipse.linuxtools.internal.rpm.ui.editor.parser.SpecfileTag; -import org.eclipse.linuxtools.internal.rpm.ui.editor.parser.SpecfileTag.TagType; -import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile; -import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfileDefine; -import org.eclipse.linuxtools.rpm.ui.editor.parser.SpecfilePackage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Label; -import org.eclipse.swt.widgets.Text; - -public class RpmTagText { - - public RpmTagText(Composite parent, final String rpmTag, - final Specfile specfile) { - this(parent, rpmTag, specfile, SWT.SINGLE); - } - - public RpmTagText(Composite parent, final String rpmTag, - final Specfile specfile, int flag) { - Label label = new Label(parent, SWT.SINGLE); - label.setText(rpmTag); - final Text text = new Text(parent, SWT.BORDER_SOLID | flag); - SpecfileDefine define = specfile.getDefine(rpmTag); - if (null != define) { - if (define.getTagType().equals(TagType.INT)) { - text.setText(String.valueOf(define.getIntValue())); - } else { - text.setText(define.getStringValue()); - } - } - text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - text.addModifyListener(e -> specfile.modifyDefine(rpmTag, text.getText())); - } - - public RpmTagText(Composite parent, final String rpmTag, - final Specfile specfile, final SpecfilePackage rpmPackage, int flag) { - Label label = new Label(parent, SWT.SINGLE); - label.setText(rpmTag); - final Text text = new Text(parent, SWT.BORDER_SOLID | flag); - SpecfileDefine define = specfile.getDefine(rpmTag, rpmPackage); - if (null != define) { - text.setText(define.getStringValue()); - } - text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - text.addModifyListener(e -> specfile.modifyDefine(rpmTag, rpmPackage, text.getText())); - } - - public RpmTagText(Composite parent, final SpecfileTag require, final Specfile specfile) { - Label label = new Label(parent, SWT.SINGLE); - label.setText(Messages.RpmTagText_0); - final Text text = new Text(parent, SWT.BORDER_SOLID); - text.setText(require.getStringValue()); - text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); - text.addModifyListener(e -> specfile.modifyDefine(require, text.getText())); - } - -} diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/forms/SpecfileFormEditor.java b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/forms/SpecfileFormEditor.java deleted file mode 100644 index b063f1c673..0000000000 --- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/forms/SpecfileFormEditor.java +++ /dev/null @@ -1,73 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009, 2017 Red Hat Inc. - * 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: - * Red Hat - initial API and implementation - *******************************************************************************/ -package org.eclipse.linuxtools.internal.rpm.ui.editor.forms; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.linuxtools.internal.rpm.ui.editor.RpmSections; -import org.eclipse.linuxtools.internal.rpm.ui.editor.SpecfileEditor; -import org.eclipse.linuxtools.rpm.ui.editor.parser.Specfile; -import org.eclipse.swt.widgets.Display; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.forms.editor.FormEditor; -import org.eclipse.ui.forms.editor.FormPage; -import org.eclipse.ui.forms.widgets.FormToolkit; - -public class SpecfileFormEditor extends FormEditor { - - SpecfileEditor editor; - - public SpecfileFormEditor() { - super(); - editor = new SpecfileEditor(); - } - - @Override - protected FormToolkit createToolkit(Display display) { - // Create a toolkit that shares colors between editors. - return new FormToolkit(Display.getCurrent()); - } - - @Override - protected void addPages() { - try { - int index = addPage(editor, getEditorInput()); - setPageText(index, Messages.SpecfileFormEditor_0); - Specfile specfile = editor.getSpecfile(); - FormPage mainPackage = new MainPackagePage(this, specfile); - addPage(0, mainPackage); - addPage(1, new RpmSectionPage(this, specfile, RpmSections.PREP_SECTION)); - addPage(2, new RpmSectionPage(this, specfile, RpmSections.BUILD_SECTION)); - addPage(3, new RpmSectionPage(this, specfile, RpmSections.INSTALL_SECTION)); - } catch (PartInitException e) { - // - } - } - - @Override - public void doSave(IProgressMonitor monitor) { - editor.doSave(monitor); - } - - @Override - public void doSaveAs() { - // noop - } - - @Override - public boolean isSaveAsAllowed() { - return false; - } - - @Override - public boolean isDirty() { - return editor.isDirty(); - } -} diff --git a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/forms/messages.properties b/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/forms/messages.properties deleted file mode 100644 index d580b56c1c..0000000000 --- a/rpm/org.eclipse.linuxtools.rpm.ui.editor/src/org/eclipse/linuxtools/internal/rpm/ui/editor/forms/messages.properties +++ /dev/null @@ -1,20 +0,0 @@ -############################################################################### -# Copyright (c) 2010 Red Hat, Inc. -# 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: -# Red Hat - initial API and implementation -############################################################################### -MainPackagePage_0=Overview -MainPackagePage_1=Overview -MainPackagePage_2=Main Package information -MainPackagePage_3=Main package information -MainPackagePage_4=Build Requires -MainPackagePage_5=Requires -MainPackagePage_6=Subpackages -MainPackagePage_7=Requires -RpmTagText_0=Require -SpecfileFormEditor_0=Source |