Skip to content
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.

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

Rename supplier.chemclipse to supplier.ocx #1539

Merged
merged 4 commits into from
Oct 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.feature</name>
<name>org.eclipse.chemclipse.xxd.converter.supplier.ocx.feature</name>
<comment></comment>
<projects>
</projects>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
</license>

<plugin
id="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse"
id="org.eclipse.chemclipse.xxd.converter.supplier.ocx"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>

<plugin
id="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui"
id="org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui"
download-size="0"
install-size="0"
version="0.0.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.chemclipse.converter;bundle-version="0.8.0",
org.eclipse.chemclipse.model;bundle-version="0.8.0",
org.eclipse.chemclipse.support;bundle-version="0.8.0",
org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;bundle-version="0.8.0",
org.eclipse.chemclipse.xxd.converter.supplier.ocx;bundle-version="0.8.0",
jakarta.xml.bind-api;bundle-version="4.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.chemclipse.converter;bundle-version="0.8.0",
org.eclipse.chemclipse.model;bundle-version="0.8.0",
org.eclipse.chemclipse.support;bundle-version="0.8.0",
org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;bundle-version="0.8.0"
org.eclipse.chemclipse.xxd.converter.supplier.ocx;bundle-version="0.8.0"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.chemclipse.msd.converter.supplier.mzxml.preferences
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.chemclipse.xxd.converter.supplier.chemclipse</name>
<name>org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui</name>
<comment></comment>
<projects>
</projects>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
Manifest-Version: 1.0
Automatic-Module-Name: org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui
Automatic-Module-Name: org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui
Bundle-ManifestVersion: 2
Bundle-Name: Open Chromatography Binary UI
Bundle-SymbolicName: org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui;singleton:=true
Bundle-SymbolicName: org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui;singleton:=true
Bundle-Version: 0.9.0.qualifier
Bundle-Activator: org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.Activator
Bundle-Activator: org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;bundle-version="0.8.0",
org.eclipse.chemclipse.xxd.converter.supplier.ocx;bundle-version="0.8.0",
org.eclipse.chemclipse.support;bundle-version="0.8.0",
org.eclipse.chemclipse.support.ui;bundle-version="0.8.0",
org.eclipse.ui.forms;bundle-version="3.6.200",
Expand All @@ -34,4 +34,4 @@ Require-Bundle: org.eclipse.ui,
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Vendor: ChemClipse
Service-Component: OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.processors.ChromatogramFileExportProcessSupplier.xml
Service-Component: OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.processors.ChromatogramFileExportProcessSupplier.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.processors.ChromatogramFileExportProcessSupplier">
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.processors.ChromatogramFileExportProcessSupplier">
<service>
<provide interface="org.eclipse.chemclipse.processing.supplier.IProcessTypeSupplier"/>
</service>
<implementation class="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.processors.ChromatogramFileExportProcessSupplier"/>
<implementation class="org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.processors.ChromatogramFileExportProcessSupplier"/>
</scr:component>
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,31 @@
point="org.eclipse.ui.preferencePages">
<page
category="org.eclipse.chemclipse.converter.ui.converterPreferencePage"
class="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences.PreferencePage"
class="org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.preferences.PreferencePage"
id="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences.converterPreferencePage"
name="Open Chromatography Converter">
</page>
<page
category="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences.converterPreferencePage"
class="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences.PreferencePageOCB"
class="org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.preferences.PreferencePageOCB"
id="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences.converterPreferencePageOCB"
name="Measurement Data (*.ocb)">
</page>
<page
category="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences.converterPreferencePage"
class="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences.PreferencePageOCM"
class="org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.preferences.PreferencePageOCM"
id="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences.converterPreferencePageOCM"
name="Process Method Data (*.ocm)">
</page>
<page
category="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences.converterPreferencePage"
class="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences.PreferencePageOCQ"
class="org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.preferences.PreferencePageOCQ"
id="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences.converterPreferencePageOCQ"
name="Quantitation Data (*.ocq)">
</page>
<page
category="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences.converterPreferencePage"
class="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences.PreferencePageOCS"
class="org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.preferences.PreferencePageOCS"
id="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences.converterPreferencePageOCS"
name="Sequence Data (*.ocs)">
</page>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
* Contributors:
* Dr. Philip Wenig - initial API and implementation
*******************************************************************************/
package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui;
package org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui;

import org.osgi.framework.BundleContext;
import org.eclipse.chemclipse.support.ui.activator.AbstractActivatorUI;
import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier;
import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier;

public class Activator extends AbstractActivatorUI {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
* Contributors:
* Dr. Philip Wenig - initial API and implementation
*******************************************************************************/
package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences;
package org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.preferences;

import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.LabelFieldEditor;
import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.Activator;
import org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.Activator;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
* Contributors:
* Dr. Philip Wenig - initial API and implementation
*******************************************************************************/
package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences;
package org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.preferences;

import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.SpacerFieldEditor;
import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier;
import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.Activator;
import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.versions.ChromatogramVersion;
import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier;
import org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.Activator;
import org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions.ChromatogramVersion;
import org.eclipse.jface.preference.ComboFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.jface.preference.ScaleFieldEditor;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
* Contributors:
* Dr. Philip Wenig - initial API and implementation
*******************************************************************************/
package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences;
package org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.preferences;

import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.SpinnerFieldEditor;
import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier;
import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.Activator;
import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.versions.MethodVersion;
import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier;
import org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.Activator;
import org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions.MethodVersion;
import org.eclipse.jface.preference.ComboFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.ui.IWorkbench;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
* Contributors:
* Dr. Philip Wenig - initial API and implementation
*******************************************************************************/
package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences;
package org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.preferences;

import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.SpinnerFieldEditor;
import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier;
import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.Activator;
import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.versions.QuantDatabaseVersion;
import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier;
import org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.Activator;
import org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions.QuantDatabaseVersion;
import org.eclipse.jface.preference.ComboFieldEditor;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.ui.IWorkbench;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
* Contributors:
* Dr. Philip Wenig - initial API and implementation
*******************************************************************************/
package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.preferences;
package org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.preferences;

import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.Activator;
import org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.Activator;
import org.eclipse.jface.preference.FieldEditorPreferencePage;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@
* Contributors:
* Philip Wenig - initial API and implementation
*******************************************************************************/
package org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui.processors;
package org.eclipse.chemclipse.xxd.converter.supplier.ocx.ui.processors;

import java.io.File;
import java.util.Collection;
import java.util.Collections;
import java.util.concurrent.Callable;

import org.eclipse.chemclipse.csd.converter.io.IChromatogramCSDWriter;
import org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io.ChromatogramWriterCSD;
import org.eclipse.chemclipse.csd.converter.supplier.ocx.io.ChromatogramWriterCSD;
import org.eclipse.chemclipse.csd.model.core.IChromatogramCSD;
import org.eclipse.chemclipse.logging.core.Logger;
import org.eclipse.chemclipse.model.core.IChromatogram;
import org.eclipse.chemclipse.model.selection.IChromatogramSelection;
import org.eclipse.chemclipse.model.supplier.IChromatogramSelectionProcessSupplier;
import org.eclipse.chemclipse.msd.converter.io.IChromatogramMSDWriter;
import org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io.ChromatogramWriterMSD;
import org.eclipse.chemclipse.msd.converter.supplier.ocx.io.ChromatogramWriterMSD;
import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD;
import org.eclipse.chemclipse.processing.DataCategory;
import org.eclipse.chemclipse.processing.core.ICategories;
Expand All @@ -35,11 +35,11 @@
import org.eclipse.chemclipse.support.ui.files.ExtendedFileDialog;
import org.eclipse.chemclipse.support.ui.workbench.DisplayUtils;
import org.eclipse.chemclipse.wsd.converter.io.IChromatogramWSDWriter;
import org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io.ChromatogramWriterWSD;
import org.eclipse.chemclipse.wsd.converter.supplier.ocx.io.ChromatogramWriterWSD;
import org.eclipse.chemclipse.wsd.model.core.IChromatogramWSD;
import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences.PreferenceSupplier;
import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.settings.ChromatogramExportSettings;
import org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.versions.IFormatVersion;
import org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences.PreferenceSupplier;
import org.eclipse.chemclipse.xxd.converter.supplier.ocx.settings.ChromatogramExportSettings;
import org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions.IFormatVersion;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.FileDialog;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ui</name>
<name>org.eclipse.chemclipse.xxd.converter.supplier.ocx</name>
<comment></comment>
<projects>
</projects>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Manifest-Version: 1.0
Automatic-Module-Name: org.eclipse.chemclipse.xxd.converter.supplier.chemclipse
Automatic-Module-Name: org.eclipse.chemclipse.xxd.converter.supplier.ocx
Eclipse-RegisterBuddy: org.eclipse.chemclipse.model, org.eclipse.chemclipse.msd.model
Bundle-ManifestVersion: 2
Bundle-Name: Open Chromatography Binary
Bundle-SymbolicName: org.eclipse.chemclipse.xxd.converter.supplier.chemclipse;singleton:=true
Bundle-SymbolicName: org.eclipse.chemclipse.xxd.converter.supplier.ocx;singleton:=true
Bundle-Version: 0.9.0.qualifier
Bundle-Activator: org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.Activator
Bundle-Activator: org.eclipse.chemclipse.xxd.converter.supplier.ocx.Activator
Bundle-Vendor: ChemClipse
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.chemclipse.msd.converter;bundle-version="0.8.0",
Expand All @@ -24,16 +24,16 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.chemclipse.xxd.model;bundle-version="0.9.0"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.chemclipse.csd.converter.supplier.chemclipse.converter,
org.eclipse.chemclipse.csd.converter.supplier.chemclipse.io,
org.eclipse.chemclipse.msd.converter.supplier.chemclipse.converter,
org.eclipse.chemclipse.msd.converter.supplier.chemclipse.io,
org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.converter,
org.eclipse.chemclipse.wsd.converter.supplier.chemclipse.io,
org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.preferences,
org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.settings,
org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.versions,
org.eclipse.chemclipse.xxd.converter.supplier.io.exception
Export-Package: org.eclipse.chemclipse.csd.converter.supplier.ocx.converter,
org.eclipse.chemclipse.csd.converter.supplier.ocx.io,
org.eclipse.chemclipse.msd.converter.supplier.ocx.converter,
org.eclipse.chemclipse.msd.converter.supplier.ocx.io,
org.eclipse.chemclipse.wsd.converter.supplier.ocx.converter,
org.eclipse.chemclipse.wsd.converter.supplier.ocx.io,
org.eclipse.chemclipse.xxd.converter.supplier.io.exception,
org.eclipse.chemclipse.xxd.converter.supplier.ocx.preferences,
org.eclipse.chemclipse.xxd.converter.supplier.ocx.settings,
org.eclipse.chemclipse.xxd.converter.supplier.ocx.versions
Import-Package: org.osgi.service.component.annotations;version="1.2.0"
Service-Component: OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ChromatogramProcedure.xml,
OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.system.ConverterProcessSupplier.xml
Service-Component: OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.ocx.ChromatogramProcedure.xml,
OSGI-INF/org.eclipse.chemclipse.xxd.converter.supplier.ocx.system.ConverterProcessSupplier.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ChromatogramProcedure">
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.chemclipse.xxd.converter.supplier.ocx.ChromatogramProcedure">
<service>
<provide interface="org.eclipse.chemclipse.processing.procedures.Procedure"/>
</service>
<implementation class="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.ChromatogramProcedure"/>
<implementation class="org.eclipse.chemclipse.xxd.converter.supplier.ocx.ChromatogramProcedure"/>
</scr:component>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.system.ConverterProcessSupplier">
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.chemclipse.xxd.converter.supplier.ocx.system.ConverterProcessSupplier">
<service>
<provide interface="org.eclipse.chemclipse.processing.supplier.IProcessTypeSupplier"/>
</service>
<implementation class="org.eclipse.chemclipse.xxd.converter.supplier.chemclipse.system.ConverterProcessSupplier"/>
<implementation class="org.eclipse.chemclipse.xxd.converter.supplier.ocx.system.ConverterProcessSupplier"/>
</scr:component>
Loading