From 8989510f925bc47d36e44ce92f6c152fd752ee14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Wed, 4 Jan 2023 14:11:05 +0100 Subject: [PATCH] Localize part of the UI. --- .../org.eclipse.core.resources.prefs | 1 + .../OSGI-INF/l10n/bundle.properties | 334 ++++++++++++++++- .../OSGI-INF/l10n/bundle_de.properties | 336 +++++++++++++++++- .../fragment.e4xmi | 104 +++--- .../ux/extension/xxd/ui/Activator.java | 8 + .../xxd/ui/actions/AbstractFilterAction.java | 13 +- .../xxd/ui/actions/GridLineEditAction.java | 9 +- .../ui/actions/IMeasurementFilterAction.java | 6 +- .../xxd/ui/actions/TargetLabelEditAction.java | 7 +- ...egmentMeasurementResultAdapterFactory.java | 27 +- .../xxd/ui/calibration/CalibrationEditUI.java | 13 +- .../ExtendedRetentionIndexListUI.java | 24 +- .../xxd/ui/calibration/RetentionIndexUI.java | 6 +- .../extension/xxd/ui/charts/ChartSupport.java | 1 + .../xxd/ui/charts/MassSpectrumRulerChart.java | 4 +- .../xxd/ui/custom/ChromatogramPeakChart.java | 31 +- .../ui/dialogs/ChromatogramEditorDialog.java | 3 +- .../xxd/ui/dialogs/ClassifierDialog.java | 8 +- .../xxd/ui/dialogs/DataTypeDialog.java | 5 +- .../ui/dialogs/InternalStandardDialog.java | 3 +- .../editors/AbstractChromatogramEditor.java | 8 +- .../xxd/ui/editors/ChromatogramEditor3x.java | 14 +- .../xxd/ui/editors/ChromatogramEditorCSD.java | 2 +- .../xxd/ui/editors/ChromatogramEditorTSD.java | 10 +- .../xxd/ui/editors/PlateEditorPCR.java | 1 + .../xxd/ui/editors/ProcessMethodEditor.java | 6 +- .../editors/QuantitationDatabaseEditor.java | 7 +- .../xxd/ui/editors/ScanEditorNMR.java | 24 +- .../xxd/ui/editors/ScanEditorXIR.java | 7 +- .../xxd/ui/editors/SequenceEditor.java | 8 +- .../fieldeditors/ColorCodesFieldEditor.java | 7 +- .../ui/filter/ChromatogramFilterAdjust.java | 6 +- .../xxd/ui/handlers/AbstractOpenHandler.java | 10 +- .../handlers/CreateProcessMethodHandler.java | 13 +- .../InstrumentsSettingsEditor.java | 67 ++-- .../editors/ProjectExplorerEditorSupport.java | 8 +- .../AbstractIdentificationsHandler.java | 4 +- .../handlers/RedoOperationHandler.java | 6 +- .../handlers/UndoOperationHandler.java | 6 +- .../ChannelSpecificationLabelProvider.java | 8 +- .../ui/internal/provider/ColorCodeDialog.java | 19 +- .../provider/ColorCodeLabelProvider.java | 6 +- .../provider/HeaderDataEditingSupport.java | 15 +- .../provider/HeaderDataLabelProvider.java | 6 +- .../provider/InstrumentEditingSupport.java | 22 +- .../provider/InstrumentLabelProvider.java | 10 +- .../IntegrationAreaLabelProvider.java | 14 +- .../InternalStandardEditingSupport.java | 33 +- .../InternalStandardsLabelProvider.java | 22 +- .../provider/MethodListLabelProvider.java | 97 ++--- .../provider/NamedTracesEditingSupport.java | 18 +- .../provider/NamedTracesLabelProvider.java | 6 +- .../provider/PeakScanListEditingSupport.java | 63 ++-- .../internal/provider/PeakScanListFilter.java | 22 +- .../provider/PeakScanListLabelProvider.java | 51 +-- .../provider/PeakScanListTableComparator.java | 42 +-- .../provider/PeakTableTargetComparator.java | 16 +- .../provider/PeakTargetsLabelProvider.java | 7 +- .../provider/QuantCompoundEditingSupport.java | 219 ++++++------ .../provider/QuantCompoundLabelProvider.java | 30 +- .../QuantCompoundTableComparator.java | 4 +- .../provider/QuantPeaksEditingSupport.java | 39 +- .../provider/QuantPeaksLabelProvider.java | 15 +- .../provider/QuantPeaksTableComparator.java | 4 +- .../provider/QuantReferencesComparator.java | 6 +- .../QuantReferencesEditingSupport.java | 12 +- .../provider/QuantReferencesFilter.java | 5 +- .../QuantReferencesLabelProvider.java | 8 +- .../provider/QuantResponseEditingSupport.java | 28 +- .../provider/QuantResponseLabelProvider.java | 15 +- .../QuantResponseTableComparator.java | 4 +- .../provider/QuantSignalsEditingSupport.java | 58 ++- .../provider/QuantSignalsLabelProvider.java | 24 +- .../provider/QuantSignalsTableComparator.java | 7 +- .../QuantitationListContentProvider.java | 6 +- .../QuantitationListLabelProvider.java | 29 +- .../QuantitationListTableComparator.java | 6 +- .../RetentionIndexEditingSupport.java | 6 +- .../provider/RetentionIndexLabelProvider.java | 17 +- .../provider/RetentionIndexListFilter.java | 3 +- .../RetentionIndexTableComparator.java | 4 +- .../provider/ScanInfoLabelProvider.java | 27 +- .../provider/ScanInfoTableComparator.java | 4 +- .../internal/provider/ScanLabelProvider.java | 22 +- .../provider/ScanSignalEditingSupport.java | 19 +- .../provider/ScanSignalListFilter.java | 12 +- .../provider/ScanTableComparator.java | 21 +- .../provider/SequenceFilesFilter.java | 5 +- .../provider/SequenceFilesLabelProvider.java | 14 +- .../SequenceFilesTableComparator.java | 6 +- .../internal/provider/SequenceListFilter.java | 5 +- .../provider/SequenceListLabelProvider.java | 33 +- .../provider/SequenceListTableComparator.java | 6 +- .../internal/provider/SynonymsComparator.java | 4 +- .../provider/SynonymsLabelProvider.java | 7 +- .../internal/provider/TargetListFilter.java | 5 +- .../TargetReferenceEditingSupport.java | 33 +- .../provider/TargetReferenceFilter.java | 3 +- .../TargetReferenceLabelProvider.java | 25 +- .../TargetReferenceTableComparator.java | 6 +- .../provider/TargetTemplateComparator.java | 5 +- .../TargetTemplateEditingSupport.java | 8 +- .../provider/TargetTemplateFilter.java | 5 +- .../provider/TargetTemplateLabelProvider.java | 6 +- .../internal/provider/TargetsComparator.java | 4 +- .../provider/TargetsEditingSupport.java | 115 +++--- .../provider/TargetsLabelProvider.java | 74 ++-- .../provider/TimeRangesComparator.java | 5 +- .../provider/TimeRangesEditingSupport.java | 40 +-- .../internal/provider/TimeRangesFilter.java | 5 +- .../provider/TimeRangesLabelProvider.java | 18 +- .../provider/WellDataEditingSupport.java | 15 +- .../provider/WellDataLabelProvider.java | 12 +- .../runnables/ChromatogramExportRunnable.java | 11 +- .../runnables/ChromatogramLengthModifier.java | 4 +- .../MassSpectrumIdentifierRunnable.java | 6 +- .../runnables/MethodImportRunnable.java | 6 +- .../internal/runnables/PCRExportRunnable.java | 6 +- .../internal/runnables/PCRImportRunnable.java | 6 +- .../runnables/QuantDBImportRunnable.java | 4 +- .../runnables/ScanXIRImportRunnable.java | 6 +- .../runnables/SequenceFileRunnable.java | 4 +- .../runnables/SequenceImportRunnable.java | 6 +- .../WaveSpectrumIdentifierRunnable.java | 6 +- .../support/ChromatogramHeatmapSupport.java | 33 +- .../internal/support/ManualPeakDetector.java | 9 +- .../internal/support/TableConfigSupport.java | 56 ++- .../validation/CalibrationNameValidator.java | 8 +- .../ui/internal/validation/NameValidator.java | 8 +- .../validation/NamedTraceInputValidator.java | 5 +- .../validation/QuantInputValidator.java | 4 +- .../QuantitationCompoundValidator.java | 12 +- .../QuantitationSignalValidator.java | 8 +- .../validation/ResponseFactorValidator.java | 10 +- .../validation/ResponseSignalValidator.java | 8 +- .../validation/RetentionIndexValidator.java | 10 +- .../validation/RetentionTimeValidator.java | 10 +- .../internal/validation/ShiftValidator.java | 8 +- .../TargetTemplateInputValidator.java | 6 +- .../xxd/ui/messages/ExtensionMessages.java | 33 ++ .../xxd/ui/messages/IExtensionMessages.java | 303 ++++++++++++++++ .../xxd/ui/methods/MethodFileSupport.java | 10 +- .../xxd/ui/methods/MethodSupport.java | 8 +- .../xxd/ui/methods/MethodSupportUI.java | 86 ++--- .../xxd/ui/methods/ProcessingWizard.java | 4 +- .../xxd/ui/methods/ProcessingWizardPage.java | 37 +- .../xxd/ui/methods/ResumeMethodDialog.java | 26 +- .../methods/SettingsPreferencesEditPage.java | 49 +-- .../ui/methods/SettingsPreferencesPage.java | 14 +- .../extension/xxd/ui/methods/SettingsUI.java | 13 +- .../xxd/ui/methods/SettingsWizard.java | 17 +- .../extension/xxd/ui/methods/WidgetItem.java | 36 +- .../xxd/ui/model/TracesExportOption.java | 6 +- .../extension/xxd/ui/model/TracesSupport.java | 12 +- .../ui/operations/DeletePeaksOperation.java | 10 +- .../DeleteScanTargetsOperation.java | 6 +- .../ui/part/support/DataUpdateSupport.java | 6 +- .../ui/part/support/EditorUpdateSupport.java | 49 ++- .../support/GenericSupplierEditorSupport.java | 10 +- .../xxd/ui/part/support/OverviewSupport.java | 12 +- .../part/support/SupplierEditorSupport.java | 6 +- .../parts/AbstractLibraryInformationPart.java | 6 +- .../xxd/ui/parts/ComparisonScanChartPart.java | 21 +- .../xxd/ui/parts/EditHistoryPart.java | 9 +- .../xxd/ui/parts/HeaderDataPart.java | 6 +- .../xxd/ui/parts/InternalStandardsPart.java | 4 +- .../xxd/ui/parts/MassSpectrumHeaderPart.java | 4 +- .../xxd/ui/parts/MassSpectrumOverlayPart.java | 3 +- .../xxd/ui/parts/MeasurementResultsPart.java | 7 +- .../extension/xxd/ui/parts/PeakChartPart.java | 4 +- .../xxd/ui/parts/PeakDetailsPart.java | 6 +- .../xxd/ui/parts/PeakQuantReferencesPart.java | 4 +- .../xxd/ui/parts/PeakTracesPart.java | 4 +- .../xxd/ui/parts/PenaltyCalculationPart.java | 4 +- .../xxd/ui/parts/PlateChartsPart.java | 6 +- .../extension/xxd/ui/parts/PlateDataPart.java | 4 +- .../xxd/ui/parts/QuantPeaksChartPart.java | 4 +- .../xxd/ui/parts/QuantPeaksListPart.java | 6 +- .../xxd/ui/parts/QuantResponseChartPart.java | 6 +- .../xxd/ui/parts/QuantResponseListPart.java | 6 +- .../xxd/ui/parts/QuantSignalsListPart.java | 4 +- .../xxd/ui/parts/SubtractScanPart.java | 2 - .../xxd/ui/parts/WellChannelsPart.java | 6 +- .../extension/xxd/ui/parts/WellChartPart.java | 6 +- .../extension/xxd/ui/parts/WellDataPart.java | 6 +- .../AbstractPreferencePageTask.java | 12 +- .../ChromatogramAxisIntensity.java | 29 +- .../ChromatogramAxisMilliseconds.java | 32 +- .../preferences/ChromatogramAxisMinutes.java | 33 +- .../ChromatogramAxisRelativeIntensity.java | 27 +- .../ui/preferences/ChromatogramAxisScans.java | 28 +- .../preferences/ChromatogramAxisSeconds.java | 29 +- .../ui/preferences/PreferenceConstants.java | 14 +- .../xxd/ui/preferences/PreferencePage.java | 8 +- .../preferences/PreferencePageBaseline.java | 14 +- .../PreferencePageChromatogram.java | 6 +- 196 files changed, 2614 insertions(+), 1521 deletions(-) create mode 100644 chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/messages/ExtensionMessages.java create mode 100644 chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/messages/IExtensionMessages.java diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/.settings/org.eclipse.core.resources.prefs b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/.settings/org.eclipse.core.resources.prefs index 801fab74d0..6363aaa6bd 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/.settings/org.eclipse.core.resources.prefs +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/.settings/org.eclipse.core.resources.prefs @@ -1,2 +1,3 @@ eclipse.preferences.version=1 +encoding//OSGI-INF/l10n/bundle_de.properties=UTF-8 encoding/=utf8 diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/OSGI-INF/l10n/bundle.properties b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/OSGI-INF/l10n/bundle.properties index 990f9817c5..7205bab6ab 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/OSGI-INF/l10n/bundle.properties +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/OSGI-INF/l10n/bundle.properties @@ -10,5 +10,337 @@ # Matthias Mailänder - initial API and implementation ############################################################################### #Properties file + +## *.e4xmi CreateProcessMethod=Create Process Method -NewProcessMethod=New Process Method \ No newline at end of file +NewProcessMethod=New Process Method +DataExplorer=Data Explorer +PeakScanList=Peak/Scan List +Targets=Targets +ComparisonScan=Comparison Scan +ScanChart=Scan Chart +SequenceExplorer=Sequence Explorer +ChromatogramOverlay=Chromatogram Overlay +PeakDetector=Peak Detector +PlateCharts=Plate Charts +WellData=Well Data +WellChart=Well Chart +PlateData=Plate Data +WellChannels=Well Channels +EditHistory=Edit History +ProjectExplorer=Project Explorer +Feedback=Feedback +Heatmap=Heatmap +HeaderData=Header Data +ChromatogramOverview=Chromatogram Overview +ScanTable = Scan Table +PeakChart=Peak Chart +PeakDetails=Peak Details +QuantitationResults=Quantitation Results +SubtractScan=Subtract Scan +CombinedScan=Combined Scan +IntegrationArea=Integration Area +InternalStandards=Internal Standards (ISTD) +MeasurementResults=Measurement Results +NMROverlay=NMR Overlay +XIROverlay=XIR Overlay +ChromatogramHeatmap=Chromatogram Heatmap +ChromatogramScanInfo=Chromatogram Scan Info +PeakQuantitationList=Peak Quantitation List +BaselineChromatogram=Baseline Chromatogram +PeakQuantitationReferences=Peak Quantitation References +QuantitationResponseChart=Quantitation Response Chart +QuantitationResponseList=Quantitation Response List +QuantitationPeaksChart=Quantitation Peaks Chart +QuantitationPeaksList=Quantitation Peaks List +QuantitationSignalsList=Quantitation Signals List +PeakTraces=Peak Traces +ScanBrowse=Scan Browse +Synonyms=Synonyms +Molecule=Molecule +PenaltyCalculation=Penalty Calculation +Undo=Undo +Redo=Redo + +## *.java +ProcessingFailed=Processing failed +ToggleChartGrid=Toggle the chart grid lines. +CantProcessSettings=Can't process settings. +ManageLabelsChromatogram=Manage the labels to display in the chromatogram. +SetRetentionTimeMinutes=Set the retention time in minutes. +SetRetentionIndex=Set the retention index. +ToggleInfoToolbar=Toggle info toolbar. +SelectChromatogramColumn=Select a chromatogram column. +ToggleSearchToolbar=Toggle search toolbar. +ToggleModifyToolbar=Toggle modify toolbar. +ToggleEditToolbar=Enable/disable to edit the table. +AddLibraryToSearch=Add the library to the list of searched databases. +RetentionIndexCalculator=RI Calculator +RetentionIndexLibraryAdded=The RI library has been added. +RetentionIndexLibraryRemoved=Removed the library from the list of searched databases. +EditEnabled=Edit is enabled. +EditDisabled=Edit is disabled. +RemoveLibraryFromSearch=Remove the library from the list of searched databases. +DeleteReferences=Delete references? +ShallDeleteReferences=Would you like to delete the references? +ChromatogramEditor=Chromatogram Editor +SaveChromatogram=Save Chromatogram +Chromatogram=Chromatogram +ChromatogramFromProjectExplorer=Chromatogram from Project Explorer +ChromatogramEditorTSD=Chromatogram Editor (TSD) +QuantitationEditor=Quantitation Editor +EditorNMR=NMR Editor +EditorXIR=FTIR/NIR/MIR Editor +SequenceEditor=Sequence Editor +AdjustChromatogramEditor=Adjust the chromatogram editor UI. +ChromatogramEditorReset=The chromatogram editor has been reset. +SelectFilesToBeOpened=You can select one or more files to be opened. +ChooseDesiredCategoriesToCreateNewMethod=Please choose the desired categories to create a new method. +ProcessMethod=Process Method +Instruments=Instruments +Instrument=Instrument +CreateNewInstrument=Create a new instrument. +EditSelectedInstrument=Edit the selected instrument. +RemoveSelectedInstrument=Remove the selected instruments. +ReallyDeleteSelectedInstrument=Do you want to delete the selected instrument(s)?" +RemoveAllInstruments=Remove all instruments. +ReallyDeleteAllInstrument=Do you want to delete all instruments? +ImportInstrumentList=Import an instrument list. +InstrumentList=Instrument List +ExportInstrumentList=Export the instrument list. +InstrumentListExported=The instrument list has been exported successfully. +InstrumentListExportFailed=Something went wrong whilew exporting the instrument list. +SaveInstrumentList=Save the instrument list. +ReallySaveIdentifications=Do you really want to delete the identifications? +RedoOperationFailed=Redo operation failed +RedoOperationFinished=Redo operation finished +UndoOperationFailed=Undo operation failed +UndoOperationFinished=Undo operation finished +Name=Name +Value=Value +FieldForColorCodeName=This is the field for the color code name. +ColorIsUsed=This color is used. +SelectColor=Select a color. +NameMustBeSpecified=A name must be specified. +NameMustNotContain=The name must not contain: +Color=Color +Identifier=Identifier +Description=Description +Area=Area +Trace=Trace +Concentration=Concentration +Unit=Unit +ResponseFactor=Response Factor +ChemicalClass=Chemical Class +Type=Type +Settings=Settings +ID=ID +ProcessorNotAvailable=The processor is not available. +PreferenceSupplierNotAvailable=The preference supplier is not available. +ProcessTypeSupportNotAvailable=The process type support is not available. +ProcessorSkipValidationOptionSet=The processor {0} skip validation option is set. +ProcessorPreferencesNotAvailable=The processor {0} preferences are not available. +ProcessorHasNoSettingsClass=The processor {0} has no settings class. +ProcessorUsesSystemDefaultSettings=The processor {0} uses system default settings. +ProcessorSettingsCannotBetParsed=The processor {0} settings can't be parsed. +Traces=Traces +BestTarget=Best Target +ActiveForAnalysis=Active for Analysis +RTmin=RT [min] +RRTmin=RRT [min] +RI=RI +AreaTotal=Area +StartRetentionTime=Start RT [min] +StopRetentionTime=Stop RT [min] +Width=Width +ScanNumberAtPeakMax=Scan# at Peak Maximum +SignalToNoise=S/N +Leading=Leading +Tailing=Tailing +ModelDescription=Model Description +Detector=Detector +Integrator=Integrator +SuggestedComponents=Suggested Components +AreaPercent=Area [%] +Quantifier=Quantifier +Classifier=Classifier +ConcentrationUnit=Concentration Unit +CalibrationMethod=Calibration Method +CrossZero=Cross Zero +UseTic=Use TIC +RetentionTime=Retention Time (RT) +RetentionTimeLower=RT (-) +RetentionTimeUpper=RT (+) +RetentionIndexRI=Retention Index (RI) +RetentionIndexLower=RI (-) +RetentionIndexUpper=RI (+) +Flag=Flag +Signal=Signal +Response=Response +RelativeResponse=Relative Response +Uncertainty=Uncertainty +Use=Use +RetentionTimeMinutes=Retention Time (Minutes) +RetentionIndex=Retention Index +EmptyCaps=EMPTY +SIM=SIM +ScanCaps=SCAN +ScanHash=Scan# +TimeMin=Time [min] +CountIons=Count Ions +SimScan=SIM/SCAN +SizeKB=Size (KB) +SampleName=Sample Name +DataPath=Data Path +DataFile=Data File +Advice=Advice +Vial=Vial +Substance=Substance +Multiplier=Multiplier +InjectionVolume=Injection Volume +ReportMethod=Report Method +Synonym=Synonym +Visible=Visible +LibraryField=Library Field +VerifiedManually=Verified (manually) +MatchFactor=Match Factor +ReverseMatchFactor=Reverse Match Factor +MatchFactorDirect=Match Factor Direct +ReverseMatchFactorDirect=Reverse Match Factor Direct +Probability=Probability +MolWeight=Mol Weight +ExcactMass=Excact Mass +Miscellaneous=Miscellaneous +DatabaseIndex=Database Index +Rating=Rating +Comments=Comments +Formula=Formula +Contributor=Contributor +ReferenceID=Reference ID +TargetHasBeenEdited=The target has been edited. +StartTimeMin=Start Time [min] +CenterTimeMin=Center Time [min] +StopTimeMin=Stop Time [min] +ChromatogramLengthModified=Chromatogram Length Modified +ScanIdentification=Scan Identification +ImportProcessMethod=Import Process Method +ExportPlate=Export Plate +ImportPlate=Import Plate +ImportQuantitationDatabase=Import Quantitation Database +ImportScan=Import Scan +ImportSequences=Import Sequences +ReadSequence=Read Sequence +EnterCalibrationIndexName=Please enter a calibration index name, e.g. Hexane. +NamedTraceAlreadyExists=The named trace already exists. +EnterCorrectName=Please enter a correct name. +EnterCompoundExample=Please enter a compound, e.g. +EnterSignalExample=Please enter a signal, e.g. +EnterCorrectResponseFactor=Please enter a correct response factor. +ResponseFactorMustNotBeNegative=The response factor must not be negative. +EnterResponseSignalExample=Please enter a response signal, e.g. +EnterCorrectRetentionIndexExample=Please enter a correct retention index, e.g. +RetentionIndexMustNotBeNegative=The retention index must not be negative. +EnterCorrectRetentionTimeMinutesExample=Please enter a correct retention time in minutes, e.g. +RetentionTimeMustNotBeNegative=The retention time must not be negative. +EnterValidNumber=Please enter a valid number. +TargetTemplateAlreadyExists=The target template already exists. +ProcessMethodFilename=ProcessMethod +SaveProcessMethodAs=Save Process Method As +RequestedConverterDoesNotExist=The requested converter does not exists. +ReportExport=Report Export +ChromatogramExport=Chromatogram Export +MethodEditor=Method Editor +SelectMethodsDirectory=Please select a directory via the settings where your methods are located. +EditSelectedMethod=Edit the selected method. +EditMethod=Edit Method +CopyMethod=Copy Method +CantCopyMethodContainer=You can't copy this method because it is a method container. +ShallCopyMethod=Do you want to copy the method: {0}? +CantCopyMethodFilesystem=Can't determine the file for copying, maybe it was already deleted or you don't have sufficient rights? +DeleteSelectedMethod=Delete the selected method. +DeleteMethod=Delete Method +CantDeleteMethodReadonly=You can't delete this method because it is read only +ShallDeleteMethod=Do you want to delete the method: {0}? +CantDeleteMethodFilesystem=Can't determine the file for deletion, maybe it was already deleted or you don't have sufficient rights? +ApplyMethodSelectedChromatogram=Apply the method to the selected chromatogram. +SelectMethodDirectory=Select the method directory. +MethodDirectory=Method Directory +ProcessMethodFailedSeeFeedback=Failed to execute process method. See Feedback for details. +ProcessMethodExecutionCanceled=The process method execution has been cancelled. +ProcessEntry=Process Entry +SelectProcessEntry=Select a process entry. +SelectDataCategories=Select the data categories to list processors. +Context=Context +Category=Category +Processor=Processor +SelectCategoryProcessorItems=Select the {0} processor items. +SelectProcessor=Please select a processor. +SelectOneDataType=Please select at least one data type. +SelectCategory=Please select a category. +SelectProcessor=Please select a processor. +ResumeProcessMethodAtEntry=Select to resume the method at the given process entry. +ResumeFollowingEntryDefaultComplete=Resume processing at the following entry. By default, use the complete method. +CompleteMethod=Complete Method +RememberDecisionDontShowAgain=Remember my decision and don't show the dialog again. +RevertDecisionInSettings=You can revert this decision in the settings. +EditStoredDataForSelectedProcessor=Edit the stored data for the selected processor. +RemoveStoredDataResetDefaultsForSelectedProcessor=Removes the stored data for the selected processor and resets it to the defaults. +RemoveAllStoredDataResetDefaults=Removes all stored data and resets to the defaults. +ResetSettingsForAllProcessors=Would you like to reset the settings for all processors? +ExpandAllProcessorItems=Expand all processor items. +CollapseAllProcessorItems=Collapse all processor items. +DisplaySettings=Display Settings +Yes=yes +No=no +Options=Options +SystemDefault=System Default +ResetSettingsForSelectedProcessors=Would you like to reset the settings for the selected processors? +UseSystemOptions=Use System Options +NoSystemOptionsAvailable=This processor does not offer system options or they are not applicable at the moment. +UseSpecificOptions=Use Specific Options +ProcessorOffersNoOptions=This processor offers no options. +EditProcessorOptions=Edit Processor Options +SelectOptionsForProcessorName=Select the options for {0} +ManageProcessorOptions=Manage Processor Options +ManagePreferences=Manage Preferences +ProcessorOptionsBelowSelectToManageRemoveState=Below you find all currently stored processor Options, select one to manage or remove the stored state +ChooseLocation=Please choose a location ... +Text=Text +NamedTrace=Named Trace +Unknown=Unknown +DeletePeaks=Delete Peaks +PeaksDeleted=Peaks were deleted. +PeaksUndeleted=Peaks were added back again. +DeleteScanTargets=Delete Scan Targets +Generic=Generic +NA=n.a. +Mandatory=Mandatory +Additional=Additional +ChromatogramIntensityYAxis=Chromatogram Intensity (Y Axis) +Title=Title +Format=Format +Show=Show +Position=Position +FontName=Font Name +FontSize=Font Size +FontStyle=Font Style +GridLineStyle=Grid Line Style +GridLineColor=Grid Line Color +ShowAxisTitle=Show Axis Title +ChromatogramMilisecondsXAxis=Chromatogram Milliseconds (X Axis) +ChromatogramMinutesXAxis=Chromatogram Minutes (X Axis) +ShowAxisLine=Show Axis Line +ShowAxisPositionMarker=Show Axis Position Marker +ChromatogramScansXAxis=Chromatogram Scans (X Axis) +ChromatogramSecondsXAxis=Chromatogram Seconds (X Axis) +LeftTop=Left Top +LeftCenter=Left Center +RightTop=Right Top +BottomLeft=Bottom Left +BottomCenter=Bottom Center +BottomRight=Bottom Right +TimeRangePath=Time Range Path +EditorTSD=Editor TSD +Baseline=Baseline +CompressionType=Compression Type +DisplayColorScheme=Display Color Scheme diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/OSGI-INF/l10n/bundle_de.properties b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/OSGI-INF/l10n/bundle_de.properties index da7da3c809..c1579b5399 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/OSGI-INF/l10n/bundle_de.properties +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/OSGI-INF/l10n/bundle_de.properties @@ -7,8 +7,340 @@ # http://www.eclipse.org/legal/epl-v10.html # # Contributors: -# Matthias Mailänder - initial API and implementation +# Matthias Mailänder - initial API and implementation ############################################################################### #Properties file + +## *.e4xmi CreateProcessMethod=Erstelle Prozessmethode -NewProcessMethod=Neue Prozessmethode \ No newline at end of file +NewProcessMethod=Neue Prozessmethode +DataExplorer=Daten-Explorer +PeakScanList=Peak/Scan-Liste +Targets=Treffer +ComparisonScan=Vergleichs-Scan +ScanChart=Scan-Diagramm +SequenceExplorer=Sequenz-Explorer +ChromatogramOverlay=Chromatogram Ãœberlagerung +PeakDetector=Peak-Detektor +PlateCharts=Plattendiagramme +WellData=Well-Daten +WellChart=Well-Diagramm +PlateData=Plattendaten +WellChannels=Well-Kanäle +EditHistory=Bearbeitungsverlauf +ProjectExplorer=Projekt-Explorer +Feedback=Rückmeldung +Heatmap=Heatmap +HeaderData=Kopfdaten +ChromatogramOverview=Chromatogramm-Ãœbersicht +ScanTable = Scan-Tabelle +PeakChart=Peak-Diagramm +PeakDetails=Peak-Details +QuantitationResults=Quantifizierungsergebnisse +SubtractScan=Scan-Subtraktion +CombinedScan=Kombinierter Scan +IntegrationArea=Integrationsfläche +InternalStandards=Interne Standards (ISTD) +MeasurementResults=Messergebnisse +NMROverlay=NMR-Ãœberlagerung +XIROverlay=XIR-Ãœberlagerung +ChromatogramHeatmap=Chromatogramm-Heatmap +ChromatogramScanInfo=Chromatogramm-Scan-Info +PeakQuantitationList=Peak-Quantifizierungs-Liste +BaselineChromatogram=Baselinien-Chromatogramm +PeakQuantitationReferences=Peak-Quantifizierungsverweise +QuantitationResponseChart=Quantifizierung-Response-Diagramm +QuantitationResponseList=Quantifizierung-Response-Liste +QuantitationPeaksChart=Quantifizierung-Peak-Diagramm +QuantitationPeaksList=Quantifizierung-Peak-Liste +QuantitationSignalsList=Quantitation-Signal-Liste +PeakTraces=Peak Massenspuren +ScanBrowse=Scan-Suche +Synonyms=Synonyme +Molecule=Molekül +PenaltyCalculation=Strafwertberechnung +Undo=rückgängig +Redo=wiederholen + +## *.java +ProcessingFailed=Prozessierung fehlgeschlagen. +ToggleChartGrid=Diagramm Gitterlinie umschalten. +CantProcessSettings=Einstellungen können nicht verarbeitet werden. +ManageLabelsChromatogram=Verwalten Sie die Beschriftungen, die im Chromatogramm angezeigt werden sollen. +SetRetentionTimeMinutes=Setzt die Retentionszeit in Minuten fest. +SetRetentionIndex=Setzt den Retentionsindex fest. +ToggleInfoToolbar=Infoleiste umschalten. +SelectChromatogramColumn=Chromatogramsäule auswählen. +ToggleSearchToolbar=Suchleiste umschalten +ToggleModifyToolbar=Modifizierleiste umschalten +ToggleEditToolbar=Aktivieren/Deaktivieren, um die Tabelle zu bearbeiten. +AddLibraryToSearch=Fügen Sie die Bibliothek zur Liste der durchsuchten Datenbanken hinzu. +RetentionIndexCalculator=RI Berechner +RetentionIndexLibraryAdded=Die RI Bibliothek wurde hinzugefügt. +RetentionIndexLibraryRemoved=Bibliothek aus der Liste durchsuchbarer Datenbanken entfernt. +EditEnabled=Bearbeiten ist aktiviert. +EditDisabled=Bearbeiten ist deaktiviert. +RemoveLibraryFromSearch=Entferne die Bibliothek aus der Liste durchsuchbarer Datenbanken. +DeleteReferences=Referenzen löschen? +ShallDeleteReferences=Sollen die Referenzen gelöscht werden? +ChromatogramEditor=Chromatogramm-Editor +SaveChromatogram=Chromatogramm Speichern +Chromatogram=Chromatogramm +ChromatogramFromProjectExplorer=Chromatogramm aus Projekt-Explorer +ChromatogramEditorTSD=Chromatogramm-Editor (TSD) +QuantitationEditor=Quantifizierungs-Editor +EditorNMR=NMR-Editor +EditorXIR=FTIR/NIR/MIR-Editor +SequenceEditor=Sequenz-Editor +AdjustChromatogramEditor=Passt die Benutzeroberfläche des Chromatogrammeditors an. +ChromatogramEditorReset=Der Chromatogrammeditor wurde zurückgesetzt. +SelectFilesToBeOpened=Sie können eine oder mehrere zu öffnende Dateien auswählen. +ChooseDesiredCategoriesToCreateNewMethod=Bitte wählen Sie die gewünschten Kategorien aus, um eine neue Methode zu erstellen. +ProcessMethod=Prozessmethode +Instruments=Geräte +Instrument=Gerät +CreateNewInstrument=Erstelle ein neues Gerät. +EditSelectedInstrument=Bearbeite das ausgewählte Gerät. +RemoveSelectedInstrument=Entferne das ausgewählte Gerät. +ReallyDeleteSelectedInstrument=Soll das ausgewählte Gerät wirklich gelöscht werden?" +RemoveAllInstruments=Entferne alle Geräte. +ReallyDeleteAllInstrument=Sollen wirklich alle Geräte gelöscht werden? +ImportInstrumentList=Importiere eine Geräteliste. +InstrumentList=Geräteliste +ExportInstrumentList=Exportiere die Geräteliste. +InstrumentListExported=Die Geräteliste wurde erfolgreich exportiert. +InstrumentListExportFailed=Das Exportieren der Geräteliste ist fehlgeschlagen. +SaveInstrumentList=Speichere die Geräteliste. +ReallySaveIdentifications=Sollen die Identifizierungen wirklich gelöscht werden? +RedoOperationFailed=Wiederherstellungsoperation fehlgeschlagen +RedoOperationFinished=Wiederherstellungsoperation abgeschlossen +UndoOperationFailed=Rückgängigmachen fehlgeschlagen +UndoOperationFinished=Rückgängigmachen abgeschlossen +Name=Name +Value=Wert +FieldForColorCodeName=Dies ist das Feld für den Farbcodenamen. +ColorIsUsed=Diese Farbe wird verwendet. +SelectColor=Wählen Sie eine Farbe. +NameMustBeSpecified=Ein Name muss angeben werden. +NameMustNotContain=Der Name darf folgendes nicht enthalten: +Color=Farbe +Identifier=Kennung +Description=Beschreibung +Area=Fläche +Trace=Spur +Concentration=Konzentration +Unit=Einheit +ResponseFactor=Response-Faktor +ChemicalClass=Chemische Klasse +Type=Typ +Settings=Einstellungen +ID=ID +ProcessorNotAvailable=Der Prozessor ist nicht verfügbar. +PreferenceSupplierNotAvailable=Der Einstellungsanbieter ist nicht verfügbar. +ProcessTypeSupportNotAvailable=Der Prozesstyp ist nicht verfügbar. +ProcessorSkipValidationOptionSet=Die Option zum Ãœberspringen der Validierung des Prozessors {0} ist festgelegt. +ProcessorPreferencesNotAvailable=Die Einstellungen des Prozessors {0} sind nicht verfügbar. +ProcessorHasNoSettingsClass=Der Prozessor {0} hat keine Einstellungsklasse. +ProcessorUsesSystemDefaultSettings=Der Prozessor {0} verwendet Systemstandardeinstellungen. +ProcessorSettingsCannotBetParsed=Die Einstellungen des Prozessors {0} können nicht eingelesen werden. +Traces=Spuren +BestTarget=Bester Treffer +ActiveForAnalysis=Aktiv zur Analyse +RTmin=RT [min] +RRTmin=RRT [min] +RI=RI +AreaTotal=Fläche +StartRetentionTime=Start RT [min] +StopRetentionTime=Stop RT [min] +Width=Breite +ScanNumberAtPeakMax=Scan# bei Peak-Maximum +SignalToNoise=S/N +Leading=Leading +Tailing=Tailing +ModelDescription=Modellbeschreibung +Detector=Detektor +Integrator=Integrator +SuggestedComponents=Vorgeschlagene Komponenten +AreaPercent=Fläche [%] +Quantifier=Quantifizier +Classifier=Klassifizier +ConcentrationUnit=Einheit der Konzentration +CalibrationMethod=Kalibrationsmethode +CrossZero=Nulldurchgang +UseTic=TIC verwenden +RetentionTime=Retentionszeit (RT) +RetentionTimeLower=RT (-) +RetentionTimeUpper=RT (+) +RetentionIndexRI=Retentionsindex (RI) +RetentionIndexLower=RI (-) +RetentionIndexUpper=RI (+) +Flag=Markierung +Signal=Signal +Response=Response +RelativeResponse=Relativer Response +Uncertainty=Unsicherheit +Use=Verwenden +RetentionTimeMinutes=Retentionszeit (Minutes) +RetentionIndex=Retentionsindex +EmptyCaps=LEER +SIM=SIM +ScanCaps=SCAN +ScanHash=Scan# +TimeMin=Zeit [min] +CountIons=Zähle Ionen +SimScan=SIM/SCAN +SizeKB=Größe (KB) +SampleName=Probenname +DataPath=Datenpfad +DataFile=Datendatei +Advice=Rat +Vial=Vial +Substance=Substanz +Multiplier=Multiplikator +InjectionVolume=Injectionsvolumen +ReportMethod=Berichtmethode +Synonym=Synonym +Visible=Sichtbar +LibraryField=Bibliotheksfeld +VerifiedManually=Verifiziert (manuell) +MatchFactor=Ãœbereinstimmungsfaktor +ReverseMatchFactor=Umgekehrter Ãœbereinstimmungsfaktor +MatchFactorDirect=direkter Ãœbereinstimmungsfaktor +ReverseMatchFactorDirect=Umgekehrter direkter Ãœbereinstimmungsfaktor +Probability=Wahrscheinlichkeit +MolWeight=Molgewicht +ExcactMass=exakte Masse +Miscellaneous=Sonstiges +DatabaseIndex=Datenbankindex +Rating=Bewertung +Comments=Kommentar +Formula=Formel +Contributor=Mitwirkender +ReferenceID=Referenz ID +TargetHasBeenEdited=Der Treffer wurde bearbeitet. +StartTimeMin=Startzeit [min] +CenterTimeMin=Zentrumszeit [min] +StopTimeMin=Stopzeit [min] +ChromatogramLengthModified=Chromatogrammlänge geändert +ScanIdentification=Scan-Identifikation +ImportProcessMethod=Importiere Prozessmethode +ExportPlate=Exportiere Platte +ImportPlate=Importiere Platte +ImportQuantitationDatabase=Quantifizierungsdatenbank importieren +ImportScan=Importiere Scan +ImportSequences=Importiere Sequenz +ReadSequence=Lese Sequenz +EnterCalibrationIndexName=Bitte geben Sie einen Kalibrierungsindexnamen ein, z. Hexan. +NamedTraceAlreadyExists=Die benannte Spur existiert bereits. +EnterCorrectName=Bitte einen korrekten Namen eingeben. +EnterCompoundExample=Bitte eine Substanz eigeben, z.B. +EnterSignalExample=Bitte ein Signal eingeben, z.B. +EnterCorrectResponseFactor=Bitte einen korrekten Response-Faktor eingeben. +ResponseFactorMustNotBeNegative=Der Response-Faktor darf nicht negativ sein.. +EnterResponseSignalExample=Bitte ein Response-Signal eingeben, z.B. +EnterCorrectRetentionIndexExample=Bitte einen korrekten Retentionsindex eingeben, z.B. +RetentionIndexMustNotBeNegative=Der Retentionsindex darf nicht negativ sein. +EnterCorrectRetentionTimeMinutesExample=Bitte eine korrekte Retentionszeit in Minuten eingeben, z.B. +RetentionTimeMustNotBeNegative=Die Retentionszeit darf nicht negativ sein. +EnterValidNumber=Bitte eine gültige Zahl eingeben. +TargetTemplateAlreadyExists=Die Zielvorlage existiert bereits. +ProcessMethodFilename=ProzessMethode +SaveProcessMethodAs=Speichere Prozessmethode als +RequestedConverterDoesNotExist=Der angeforderte Konverter existiert nicht. +ReportExport=Berichtsexport +ChromatogramExport=Chromatogrammexport +MethodEditor=Methodeneditor +SelectMethodsDirectory=Bitte in den Einstellungen einen Order wählen aus dem Methoden geladen werden sollen. +EditSelectedMethod=Bearbeite die ausgewählte Methode. +EditMethod=Bearbeite Methode +CopyMethod=Kopiere Methode +CantCopyMethodContainer=Methode kann nicht kopiert werden, da sie ein Methodenbehälter ist. +ShallCopyMethod=Soll die Methode {0} kopiert werden? +CantCopyMethodFilesystem=Kann die zu kopierende Datei nicht ermitteln, vielleicht wurde sie schon gelöscht oder es fehlt die Berechtigung? +DeleteSelectedMethod=Ausgewählte Methode löschen. +DeleteMethod=Lösche Methode +CantDeleteMethodReadonly=Schreibgeschützte Methode kann nicht gelöscht werden. +ShallDeleteMethod=Soll die Methode {0} gelöscht werden? +CantDeleteMethodFilesystem=Kann die zu löschende Datei nicht ermitteln, vielleicht wurde sie schon gelöscht oder es fehlt die Berechtigung? +ApplyMethodSelectedChromatogram=Methode auf das ausgewählte Chromatogramm anwenden. +SelectMethodDirectory=Methodenverzeichnis auswählen. +MethodDirectory=Methodenverzeichnis +ProcessMethodFailedSeeFeedback=Fehler beim Ausführen der Prozessmethode. Siehe Rückmeldung für Details. +ProcessMethodExecutionCanceled=Die Ausführung der Prozessmethode wurde abgebrochen. +ProcessEntry=Prozesseintrag +SelectProcessEntry=Prozesseintrag auswählen. +SelectDataCategories=Datenkategorien auswählen, um Prozessoren aufzulisten +Context=Kontext +Category=Kategorie +Processor=Prozessor +SelectCategoryProcessorItems=Die {0} Prozesseinträge auswählen. +SelectProcessor=Bitte einen Prozessor auswählen. +SelectOneDataType=Bitte mindestens einen Datentyp auswählen. +SelectCategory=Bitte eine Kategorie auswählen. +SelectProcessor=Bitte einen Prozessor auswählen. +ResumeProcessMethodAtEntry=Auswählen um die Prozessmethode am ausgewählten eintrag fortzusetzen. +ResumeFollowingEntryDefaultComplete=Prozessierung am folgenden Eintrag fortsetzen. Standardmäßig vollständige Methode abfahren. +CompleteMethod=vollständige Methode +RememberDecisionDontShowAgain=Entscheidung merken und diesen Dialog nicht mehr anzeigen. +RevertDecisionInSettings=Die Entscheidung kann in den Einstellung rückgängig gemacht werden. +EditStoredDataForSelectedProcessor=Bearbeitet die gespeicherten Daten für den ausgewählten Prozessor. +RemoveStoredDataResetDefaultsForSelectedProcessor=Entfernt die gespeicherten Daten für den ausgewählten Prozessor und setzt sie auf die Standardwerte zurück. +RemoveAllStoredDataResetDefaults=Entfernt alle gespeicherten Daten und setzt auf die Standardeinstellungen zurück. +ResetSettingsForAllProcessors=Sollen die Einstellungen für alle Prozessoren zurückgesetzt werden? +ExpandAllProcessorItems=Erweitert alle Prozessorelemente. +CollapseAllProcessorItems=Blenden Sie alle Prozessorelemente aus. +DisplaySettings=Anzeigeeinstellungen +Yes=ja +No=nein +Options=Optionen +SystemDefault=Systemstandard +ResetSettingsForSelectedProcessors=Möchten Sie die Einstellungen für die ausgewählten Prozessoren zurücksetzen? +UseSystemOptions=Verwende Systemeinstellungen. +NoSystemOptionsAvailable=Dieser Prozessor bietet keine Systemoptionen oder sie sind derzeit nicht anwendbar. +UseSpecificOptions=Verwende spezifizierte Einstellungen. +ProcessorOffersNoOptions=Dieser Prozessor bietet keine Optionen. +EditProcessorOptions=Bearbeite Prozessoroptionen +SelectOptionsForProcessorName=Wählen Sie die Optionen für {0} +ManageProcessorOptions=Prozessoroptionen verwalten +ManagePreferences=Einstellungen verwalten +ProcessorOptionsBelowSelectToManageRemoveState=Unten finden Sie alle derzeit gespeicherten Prozessoroptionen, wählen Sie eine aus, um den gespeicherten Zustand zu verwalten oder zu entfernen +ChooseLocation=Bitte wählen Sie einen Ort ... +Text=Text +NamedTrace=Benannte Spur +Unknown=Unbekannt +DeletePeaks=Lösche Peaks +PeaksDeleted=Peaks wurden gelöscht. +PeaksUndeleted=Peaks wurden wieder hinzugefügt. +DeleteScanTargets=Lösche benannte Scans +Generic=Generisch +NA=n.v. +Mandatory=Obligatorisch +Additional=Zusätzlich +ChromatogramIntensityYAxis=Chromatogrammintensität (Y-Achse) +Title=Titel +Format=Format +Show=Zeige +Position=Position +FontName=Schriftart +FontSize=Schriftgröße +FontStyle=Schriftstil +GridLineStyle=Gitterlinienstil +GridLineColor=Gitterlinienfarbe +ShowAxisTitle=Zeige Achsentitel +ChromatogramMilisecondsXAxis=Chromatogramm Millisekunden (X-Achse) +ChromatogramMinutesXAxis=Chromatogramm Minuten (X-Achse) +ShowAxisLine=Zeige Achsenlinie +ShowAxisPositionMarker=Zeiten Achsenpositionsmarkierung +ChromatogramScansXAxis=Chromatogramm Scans (X-Achse) +ChromatogramSecondsXAxis=Chromatogramm Sekunden (X-Achse) +LeftTop=Links oben +LeftCenter=Linke Mitte +RightTop=Rechts oben +BottomLeft=Unten links +BottomCenter=Unten Mitte +BottomRight=Unten rechts +TimeRangePath=Zeitbereichspfad +EditorTSD=Editor TSD +Baseline=Basislinie +CompressionType=Kompressionstyp +DisplayColorScheme=Farbschema diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/fragment.e4xmi b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/fragment.e4xmi index 32ddabe9d3..f3864f6b3e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/fragment.e4xmi +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/fragment.e4xmi @@ -2,23 +2,23 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + @@ -120,46 +120,46 @@ - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - + + + + + + + + + + + @@ -216,7 +216,7 @@ - - + + diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/Activator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/Activator.java index b7eaf6f20a..231b373820 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/Activator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/Activator.java @@ -35,6 +35,7 @@ public class Activator extends AbstractActivatorUI { private static Activator plugin; + private static BundleContext context; // private ScopedPreferenceStore preferenceStoreSubtract; private DataUpdateSupport dataUpdateSupport; @@ -52,6 +53,7 @@ public class Activator extends AbstractActivatorUI { public void start(BundleContext context) throws Exception { super.start(context); + Activator.context = context; plugin = this; initializePreferenceStoreSubtract(PreferenceSupplier.INSTANCE()); startServices(context); @@ -74,6 +76,7 @@ public void stop(BundleContext context) throws Exception { plugin = null; dataUpdateSupport = null; + Activator.context = null; stopServices(context); super.stop(context); } @@ -88,6 +91,11 @@ public static Activator getDefault() { return plugin; } + public static BundleContext getContext() { + + return context; + } + public ScopedPreferenceStore getPreferenceStoreSubtract() { return preferenceStoreSubtract; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/actions/AbstractFilterAction.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/actions/AbstractFilterAction.java index 86f26ac8e0..387cb936d1 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/actions/AbstractFilterAction.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/actions/AbstractFilterAction.java @@ -15,11 +15,12 @@ import java.util.function.Consumer; import org.eclipse.chemclipse.processing.core.DefaultProcessingResult; -import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.IMessageConsumer; +import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; import org.eclipse.chemclipse.processing.filter.Filter; import org.eclipse.chemclipse.processing.ui.support.ProcessingInfoPartSupport; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.runtime.Adapters; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.action.Action; @@ -52,10 +53,10 @@ public void runWithEvent(Event event) { Widget widget = event.widget; Shell shell; - if(widget instanceof MenuItem) { - shell = ((MenuItem)widget).getParent().getShell(); - } else if(widget instanceof Control) { - shell = ((Control)widget).getShell(); + if(widget instanceof MenuItem menuItem) { + shell = menuItem.getParent().getShell(); + } else if(widget instanceof Control control) { + shell = control.getShell(); } else { shell = null; } @@ -82,7 +83,7 @@ public void run(IProgressMonitor monitor) throws InvocationTargetException, Inte ProcessingInfoPartSupport.getInstance().update(consumer); } catch(InvocationTargetException e) { IProcessingInfo processingInfo = new ProcessingInfo<>(); - processingInfo.addErrorMessage(filter.getName(), "Processing failed", e.getTargetException()); + processingInfo.addErrorMessage(filter.getName(), IExtensionMessages.PROCESSING_FAILED, e.getTargetException()); ProcessingInfoPartSupport.getInstance().update(processingInfo); } catch(InterruptedException e) { // user canceled diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/actions/GridLineEditAction.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/actions/GridLineEditAction.java index 16b3b2eb44..f875dbf35d 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/actions/GridLineEditAction.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/actions/GridLineEditAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Lablicate GmbH. + * Copyright (c) 2021, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -13,7 +13,10 @@ import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; +import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider; import org.eclipse.chemclipse.ux.extension.xxd.ui.charts.ChromatogramChart; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.swt.ChartGridSupport; import org.eclipse.chemclipse.ux.extension.xxd.ui.swt.editors.ExtendedChromatogramUI; import org.eclipse.jface.action.Action; @@ -26,8 +29,8 @@ public class GridLineEditAction extends Action { public GridLineEditAction(ExtendedChromatogramUI extendedChromatogramUI) { - super("GridLine", ApplicationImageFactory.getInstance().getImageDescriptor(IApplicationImage.IMAGE_GRID, IApplicationImage.SIZE_16x16)); - setToolTipText("Toggle the chart grid lines."); + super("GridLine", ApplicationImageFactory.getInstance().getImageDescriptor(IApplicationImage.IMAGE_GRID, IApplicationImageProvider.SIZE_16x16)); + setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TOGGLE_CHART_GRID)); this.extendedChromatogramUI = extendedChromatogramUI; } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/actions/IMeasurementFilterAction.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/actions/IMeasurementFilterAction.java index 08c38efc19..c51c305c19 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/actions/IMeasurementFilterAction.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/actions/IMeasurementFilterAction.java @@ -21,13 +21,15 @@ import org.eclipse.chemclipse.model.core.IMeasurement; import org.eclipse.chemclipse.model.filter.IMeasurementFilter; import org.eclipse.chemclipse.model.supplier.IMeasurementFilterProcessTypeSupplier; -import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.IMessageConsumer; +import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.core.ProcessingInfo; import org.eclipse.chemclipse.processing.supplier.IProcessSupplier; import org.eclipse.chemclipse.processing.supplier.IProcessSupplierContext; import org.eclipse.chemclipse.processing.supplier.IProcessorPreferences; import org.eclipse.chemclipse.processing.ui.support.ProcessingInfoPartSupport; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.methods.SettingsWizard; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.swt.widgets.Shell; @@ -69,7 +71,7 @@ public void executeAction(Shell shell) { } } catch(IOException e) { IProcessingInfo processingInfo = new ProcessingInfo<>(); - processingInfo.addErrorMessage(filter.getName(), "Can't process settings", e); + processingInfo.addErrorMessage(filter.getName(), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CANT_PROCESS_SETTINGS), e); ProcessingInfoPartSupport.getInstance().update(processingInfo); } catch(CancellationException e) { return; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/actions/TargetLabelEditAction.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/actions/TargetLabelEditAction.java index 56a7f5a1d3..0e423f070a 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/actions/TargetLabelEditAction.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/actions/TargetLabelEditAction.java @@ -25,10 +25,13 @@ import org.eclipse.chemclipse.model.targets.TargetReference; import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; +import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider; import org.eclipse.chemclipse.support.ui.workbench.DisplayUtils; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; import org.eclipse.chemclipse.ux.extension.xxd.ui.charts.ChromatogramChart; import org.eclipse.chemclipse.ux.extension.xxd.ui.internal.charts.TargetReferenceLabelMarker; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.preferences.PreferenceConstants; import org.eclipse.chemclipse.ux.extension.xxd.ui.support.charts.ChromatogramDataSupport; import org.eclipse.chemclipse.ux.extension.xxd.ui.wizards.TargetDisplaySettingsWizard; @@ -49,9 +52,9 @@ public class TargetLabelEditAction extends Action { public TargetLabelEditAction(ILabelEditSettings labelEditSettings) { - super("Labels", ApplicationImageFactory.getInstance().getImageDescriptor(IApplicationImage.IMAGE_LABELS, IApplicationImage.SIZE_16x16)); + super("Labels", ApplicationImageFactory.getInstance().getImageDescriptor(IApplicationImage.IMAGE_LABELS, IApplicationImageProvider.SIZE_16x16)); this.labelEditSettings = labelEditSettings; - setToolTipText("Manage the labels to display in the chromatogram"); + setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.MANAGE_LABEL_CHROMATOGRAM)); setShowPreviewDefault(DEF_SHOW_PREVIEW); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/adapters/AnalysisSegmentMeasurementResultAdapterFactory.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/adapters/AnalysisSegmentMeasurementResultAdapterFactory.java index 59b51c9834..117af78291 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/adapters/AnalysisSegmentMeasurementResultAdapterFactory.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/adapters/AnalysisSegmentMeasurementResultAdapterFactory.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 Lablicate GmbH. + * Copyright (c) 2019, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -41,8 +41,7 @@ public class AnalysisSegmentMeasurementResultAdapterFactory implements IAdapterF @Override public T getAdapter(Object adaptableObject, Class adapterType) { - if(adaptableObject instanceof AnalysisSegmentMeasurementResult) { - AnalysisSegmentMeasurementResult result = (AnalysisSegmentMeasurementResult)adaptableObject; + if(adaptableObject instanceof AnalysisSegmentMeasurementResult result) { if(adapterType.isInstance(this)) { return adapterType.cast(this); } @@ -110,18 +109,17 @@ private Object[] getTreeNodes(Object[] items, TreeNode parent) { @Override public Object[] getChildren(Object parentElement) { - if(parentElement instanceof TreeNode) { - TreeNode parentNode = (TreeNode)parentElement; + if(parentElement instanceof TreeNode parentNode) { if(parentNode.getChildren() == null) { Object value = parentNode.getValue(); - if(value instanceof IAnalysisSegment) { - return getTreeNodes(((IAnalysisSegment)value).getChildSegments().toArray(), parentNode); + if(value instanceof IAnalysisSegment analysisSegment) { + return getTreeNodes(analysisSegment.getChildSegments().toArray(), parentNode); } } return parentNode.getChildren(); } - if(parentElement instanceof IAnalysisSegment) { - return ((IAnalysisSegment)parentElement).getChildSegments().toArray(); + if(parentElement instanceof IAnalysisSegment analysisSegment) { + return analysisSegment.getChildSegments().toArray(); } return new Object[0]; } @@ -129,8 +127,8 @@ public Object[] getChildren(Object parentElement) { @Override public Object getParent(Object element) { - if(element instanceof TreeNode) { - return ((TreeNode)element).getParent(); + if(element instanceof TreeNode treeNode) { + return treeNode.getParent(); } return null; } @@ -138,14 +136,13 @@ public Object getParent(Object element) { @Override public boolean hasChildren(Object element) { - if(element instanceof TreeNode) { - TreeNode treeNode = (TreeNode)element; + if(element instanceof TreeNode treeNode) { if(treeNode.hasChildren()) { return true; } Object value = treeNode.getValue(); - if(value instanceof IAnalysisSegment) { - Collection childSegments = ((IAnalysisSegment)value).getChildSegments(); + if(value instanceof IAnalysisSegment analysisSegment) { + Collection childSegments = analysisSegment.getChildSegments(); for(IAnalysisSegment segment : childSegments) { if(!(segment instanceof ChromatogramSegment)) { return true; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/calibration/CalibrationEditUI.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/calibration/CalibrationEditUI.java index 93cc9b42aa..67c78fda54 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/calibration/CalibrationEditUI.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/calibration/CalibrationEditUI.java @@ -16,12 +16,15 @@ import org.eclipse.chemclipse.model.columns.IRetentionIndexEntry; import org.eclipse.chemclipse.model.columns.RetentionIndexEntry; -import org.eclipse.chemclipse.model.core.AbstractChromatogram; +import org.eclipse.chemclipse.model.core.IChromatogramOverview; import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; +import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider; import org.eclipse.chemclipse.ux.extension.xxd.ui.internal.validation.CalibrationNameValidator; import org.eclipse.chemclipse.ux.extension.xxd.ui.internal.validation.RetentionIndexValidator; import org.eclipse.chemclipse.ux.extension.xxd.ui.internal.validation.RetentionTimeValidator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.core.databinding.validation.IValidator; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.fieldassist.ControlDecoration; @@ -116,7 +119,7 @@ private Text createTextRetentionTime(Composite parent) { Text text = new Text(parent, SWT.BORDER); text.setText(""); - text.setToolTipText("Set the retention time in minutes."); + text.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SET_RETENTION_TIME_MINUTES)); text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); // retentionTimeValidator = new RetentionTimeValidator(); @@ -137,7 +140,7 @@ private Text createTextRetentionIndex(Composite parent) { Text text = new Text(parent, SWT.BORDER); text.setText(""); - text.setToolTipText("Set the retention index."); + text.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SET_RETENTION_INDEX)); text.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); // retentionIndexValidator = new RetentionIndexValidator(); @@ -197,7 +200,7 @@ private Button createButtonSet(Composite parent) { Button button = new Button(parent, SWT.PUSH); button.setText(""); button.setToolTipText("Set the retention index."); - button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_EXECUTE_ADD, IApplicationImage.SIZE_16x16)); + button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_EXECUTE_ADD, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { @Override @@ -357,7 +360,7 @@ private IRetentionIndexEntry createRetentionIndexEntry() { IRetentionIndexEntry retentionIndexEntry = null; if(validate()) { - int retentionTime = (int)(retentionTimeValidator.getRetentionTime() * AbstractChromatogram.MINUTE_CORRELATION_FACTOR); + int retentionTime = (int)(retentionTimeValidator.getRetentionTime() * IChromatogramOverview.MINUTE_CORRELATION_FACTOR); float retentionIndex = retentionIndexValidator.getRetentionIndex(); String name = calibrationNameValidator.getName(); retentionIndexEntry = new RetentionIndexEntry(retentionTime, retentionIndex, name); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/calibration/ExtendedRetentionIndexListUI.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/calibration/ExtendedRetentionIndexListUI.java index 1b5f0ddb90..1e3ae49cc4 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/calibration/ExtendedRetentionIndexListUI.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/calibration/ExtendedRetentionIndexListUI.java @@ -28,6 +28,8 @@ import org.eclipse.chemclipse.swt.ui.notifier.UpdateNotifierUI; import org.eclipse.chemclipse.swt.ui.preferences.PreferencePageSystem; import org.eclipse.chemclipse.ux.extension.ui.support.PartSupport; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.swt.IExtendedPartUI; import org.eclipse.chemclipse.ux.extension.xxd.ui.swt.ISettingsHandler; import org.eclipse.jface.dialogs.MessageDialog; @@ -163,7 +165,7 @@ private void createToolbarMain(Composite parent) { private Button createButtonToggleToolbarInfo(Composite parent) { Button button = new Button(parent, SWT.PUSH); - button.setToolTipText("Toggle info toolbar."); + button.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TOGGLE_INFO_TOOLBAR)); button.setText(""); button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_INFO, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { @@ -197,7 +199,7 @@ public String getText(Object element) { } }); // - combo.setToolTipText("Select a chromatogram column."); + combo.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SELECT_CHROMATOGRAM_COLUMN)); combo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); combo.addSelectionListener(new SelectionAdapter() { @@ -218,7 +220,7 @@ public void widgetSelected(SelectionEvent e) { private Button createButtonToggleToolbarSearch(Composite parent) { Button button = new Button(parent, SWT.PUSH); - button.setToolTipText("Toggle search toolbar."); + button.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TOGGLE_SEARCH_TOOLBAR)); button.setText(""); button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_SEARCH, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { @@ -237,7 +239,7 @@ public void widgetSelected(SelectionEvent e) { private Button createButtonToggleToolbarModify(Composite parent) { Button button = new Button(parent, SWT.PUSH); - button.setToolTipText("Toggle modify toolbar."); + button.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TOGGLE_MODIFY_TOOLBAR)); button.setText(""); button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_EDIT_DEFAULT, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { @@ -260,7 +262,7 @@ public void widgetSelected(SelectionEvent e) { private Button createButtonToggleToolbarEdit(Composite parent) { Button button = new Button(parent, SWT.PUSH); - button.setToolTipText("Enable/disable to edit the table."); + button.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TOGGLE_EDIT_TOOLBAR)); button.setText(""); button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_EDIT_ENTRY_DEFAULT, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { @@ -280,7 +282,7 @@ public void widgetSelected(SelectionEvent e) { private Button createButtonAddLibraryToProcess(Composite parent) { Button button = new Button(parent, SWT.PUSH); - button.setToolTipText("Add the library to the list of searched databases."); + button.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.ADD_LIBRARY_TO_SEARCH)); button.setText(""); button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_ADD, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { @@ -289,7 +291,7 @@ private Button createButtonAddLibraryToProcess(Composite parent) { public void widgetSelected(SelectionEvent e) { UpdateNotifierUI.update(e.display, IChemClipseEvents.TOPIC_RI_LIBRARY_ADD_ADD_TO_PROCESS, retentionIndexFile); - MessageDialog.openConfirm(e.display.getActiveShell(), "RI Calculator", "The RI library has been added."); + MessageDialog.openConfirm(e.display.getActiveShell(), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RETENTION_INDEX_CALCULATOR), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RETENTION_INDEX_LIBRARY_ADDED)); } }); // @@ -299,7 +301,7 @@ public void widgetSelected(SelectionEvent e) { private Button createButtonRemoveLibraryFromProcess(Composite parent) { Button button = new Button(parent, SWT.PUSH); - button.setToolTipText("Remove the library from the list of searched databases."); + button.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.REMOVE_LIBRARY_FROM_SEARCH)); button.setText(""); button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_REMOVE, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { @@ -308,7 +310,7 @@ private Button createButtonRemoveLibraryFromProcess(Composite parent) { public void widgetSelected(SelectionEvent e) { UpdateNotifierUI.update(e.display, IChemClipseEvents.TOPIC_RI_LIBRARY_REMOVE_FROM_PROCESS, retentionIndexFile); - MessageDialog.openConfirm(e.display.getActiveShell(), "RI Calculator", "The RI library has been removed."); + MessageDialog.openConfirm(e.display.getActiveShell(), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RETENTION_INDEX_CALCULATOR), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RETENTION_INDEX_LIBRARY_REMOVED)); } }); // @@ -394,7 +396,7 @@ private void updateLabel() { */ RetentionIndexTableViewerUI tableViewer = getRetentionIndexTableViewerUI(); labelInfoTop.setText(builder.toString()); - String editInformation = getRetentionIndexTableViewerUI().isEditEnabled() ? "Edit is enabled." : "Edit is disabled."; + String editInformation = getRetentionIndexTableViewerUI().isEditEnabled() ? ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.EDIT_ENABLED) : ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.EDIT_DISABLED); labelInfoBottom.setText("Retention Indices: " + tableViewer.getTable().getItemCount() + " [" + retentionIndexUI.getSearchText() + "] - " + editInformation); } @@ -416,4 +418,4 @@ private String getSeparationColumnDetails(ISeparationColumn separationColumn) { private void applySettings() { } -} \ No newline at end of file +} diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/calibration/RetentionIndexUI.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/calibration/RetentionIndexUI.java index 4f7b7dcd49..679dbcedea 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/calibration/RetentionIndexUI.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/calibration/RetentionIndexUI.java @@ -21,6 +21,8 @@ import org.eclipse.chemclipse.swt.ui.components.SearchSupportUI; import org.eclipse.chemclipse.ux.extension.ui.support.PartSupport; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.e4.core.services.events.IEventBroker; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionAdapter; @@ -153,8 +155,8 @@ public void delete() { int index = table.getSelectionIndex(); if(index >= 0) { MessageBox messageBox = new MessageBox(calibrationEditUI.getShell(), SWT.ICON_WARNING); - messageBox.setText("Delete reference(s)?"); - messageBox.setMessage("Would you like to delete the reference(s)?"); + messageBox.setText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.DELETE_REFERENCES)); + messageBox.setMessage(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SHALL_DELETE_REFERENCES)); if(messageBox.open() == SWT.OK) { List keysToRemove = new ArrayList<>(); TableItem[] tableItems = table.getSelection(); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/charts/ChartSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/charts/ChartSupport.java index eb63a04c32..08469bc32e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/charts/ChartSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/charts/ChartSupport.java @@ -118,6 +118,7 @@ public static ISecondaryAxisSettings getSecondaryAxisSettingsY(String title, ICh return getSecondaryAxisSettings(chartSettings.getSecondaryAxisSettingsListY(), title); } + // TODO: this is very bad for l10n public static ISecondaryAxisSettings getSecondaryAxisSettings(List secondaryAxisSettingsList, String title) { ISecondaryAxisSettings secondaryAxisSettings = null; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/charts/MassSpectrumRulerChart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/charts/MassSpectrumRulerChart.java index f4677975f9..1907ef6b7e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/charts/MassSpectrumRulerChart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/charts/MassSpectrumRulerChart.java @@ -84,13 +84,13 @@ public void handleMouseUpEvent(Event event) { super.handleMouseUpEvent(event); if(isControlKeyPressed(event)) { stopBaselineSelection(event.x, event.y); - calculateDimension(event); + calculateDimension(); setCursorDefault(); resetSelectedRange(); } } - private void calculateDimension(Event event) { + private void calculateDimension() { BaseChart baseChart = getBaseChart(); IAxisSet axisSet = baseChart.getAxisSet(); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/custom/ChromatogramPeakChart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/custom/ChromatogramPeakChart.java index bcd2637d7c..7c265ef398 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/custom/ChromatogramPeakChart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/custom/ChromatogramPeakChart.java @@ -158,7 +158,8 @@ public void updatePeaks(List peaks, boolean clearPeakSeries) { * Clear and add the selected peaks. */ clearSelectedPeakSeries(); - if(peaks != null && peaks.size() > 0) { + // + if(peaks != null && !peaks.isEmpty()) { int index = 1; List lineSeriesDataList = new ArrayList<>(); addPeakData(peaks, lineSeriesDataList); @@ -323,20 +324,20 @@ private void addChromatogramData(List lineSeriesDataList, PeakC lineSeriesDataList.add(lineSeriesDataTIC); // if(containsTraces) { - if(chromatogramSelection instanceof IChromatogramSelectionMSD) { + if(chromatogramSelection instanceof IChromatogramSelectionMSD chromatogramSelectionMSD) { /* * XIC */ - ILineSeriesData lineSeriesDataXIC = chromatogramChartSupport.getLineSeriesData((IChromatogramSelectionMSD)chromatogramSelection, SERIES_ID_CHROMATOGRAM_XIC, DisplayType.XIC, colorActive, false); + ILineSeriesData lineSeriesDataXIC = chromatogramChartSupport.getLineSeriesData(chromatogramSelectionMSD, SERIES_ID_CHROMATOGRAM_XIC, DisplayType.XIC, colorActive, false); ILineSeriesSettings settingsXIC = lineSeriesDataXIC.getSettings(); settingsXIC.setEnableArea(enableChromatogramArea); settingsXIC.setVisible(peakChartSettings.isShowChromatogramTraces()); lineSeriesDataList.add(lineSeriesDataXIC); - } else if(chromatogramSelection instanceof IChromatogramSelectionWSD) { + } else if(chromatogramSelection instanceof IChromatogramSelectionWSD chromatogramSelectionWSD) { /* * SWC */ - ILineSeriesData lineSeriesDataSWC = chromatogramChartSupport.getLineSeriesData((IChromatogramSelectionWSD)chromatogramSelection, SERIES_ID_CHROMATOGRAM_SWC, DisplayType.SWC, colorActive, false); + ILineSeriesData lineSeriesDataSWC = chromatogramChartSupport.getLineSeriesData(chromatogramSelectionWSD, SERIES_ID_CHROMATOGRAM_SWC, DisplayType.SWC, colorActive, false); ILineSeriesSettings settingsSWC = lineSeriesDataSWC.getSettings(); settingsSWC.setEnableArea(enableChromatogramArea); settingsSWC.setVisible(peakChartSettings.isShowChromatogramTraces()); @@ -348,14 +349,12 @@ private void addChromatogramData(List lineSeriesDataList, PeakC private boolean containsTraces(IChromatogramSelection chromatogramSelection) { - if(chromatogramSelection instanceof IChromatogramSelectionMSD) { - IChromatogramSelectionMSD chromatogramSelectionMSD = (IChromatogramSelectionMSD)chromatogramSelection; - if(chromatogramSelectionMSD.getSelectedIons().size() > 0) { + if(chromatogramSelection instanceof IChromatogramSelectionMSD chromatogramSelectionMSD) { + if(!chromatogramSelectionMSD.getSelectedIons().isEmpty()) { return true; } - } else if(chromatogramSelection instanceof IChromatogramSelectionWSD) { - IChromatogramSelectionWSD chromatogramSelectionWSD = (IChromatogramSelectionWSD)chromatogramSelection; - if(chromatogramSelectionWSD.getSelectedWavelengths().size() > 0) { + } else if(chromatogramSelection instanceof IChromatogramSelectionWSD chromatogramSelectionWSD) { + if(!chromatogramSelectionWSD.getSelectedWavelengths().isEmpty()) { return true; } } @@ -392,7 +391,7 @@ private void addPeakData(List peaks, List lineSeriesData List peaksInactiveISTD = new ArrayList<>(); // for(IPeak peak : peaks) { - if(peak.getInternalStandards().size() > 0) { + if(!peak.getInternalStandards().isEmpty()) { if(peak.isActiveForAnalysis()) { peaksActiveISTD.add(peak); } else { @@ -416,7 +415,7 @@ private void addPeakData(List peaks, List lineSeriesData private void addPeaks(List lineSeriesDataList, List peaks, PlotSymbolType plotSymbolType, int symbolSize, Color symbolColor, String seriesId, boolean addLabelMarker) { - if(peaks.size() > 0) { + if(!peaks.isEmpty()) { // Collections.sort(peaks, peakRetentionTimeComparator); ILineSeriesData lineSeriesData = peakChartSupport.getPeaks(peaks, true, false, symbolColor, seriesId); @@ -510,7 +509,7 @@ private void addIdentifiedScansData(List lineSeriesDataList, IT private void addIdentifiedScansData(IChromatogramSelection chromatogramSelection, List lineSeriesDataList, List scans, PlotSymbolType plotSymbolType, int symbolSize, Color symbolColor, String seriesId) { - if(scans.size() > 0) { + if(!scans.isEmpty()) { ILineSeriesData lineSeriesData = null; lineSeriesData = scanChartSupport.getLineSeriesDataPoint(scans, false, seriesId, displayType, chromatogramSelection); ILineSeriesSettings lineSeriesSettings = lineSeriesData.getSettings(); @@ -545,7 +544,7 @@ private void addSelectedIdentifiedScanData(List lineSeriesDataL if(chromatogramSelection != null) { List selectedIdentifiedScans = chromatogramSelection.getSelectedIdentifiedScans(); - if(selectedIdentifiedScans.size() > 0) { + if(!selectedIdentifiedScans.isEmpty()) { String seriesId = SERIES_ID_IDENTIFIED_SCAN_SELECTED; Color color = Colors.getColor(preferenceStore.getString(PreferenceConstants.P_COLOR_CHROMATOGRAM_IDENTIFIED_SCAN)); PlotSymbolType symbolType = PlotSymbolType.valueOf(preferenceStore.getString(PreferenceConstants.P_CHROMATOGRAM_IDENTIFIED_SCAN_MARKER_TYPE)); @@ -633,4 +632,4 @@ private void redrawChart() { getBaseChart().redraw(); } -} \ No newline at end of file +} diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/dialogs/ChromatogramEditorDialog.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/dialogs/ChromatogramEditorDialog.java index df13620c4d..1d1f3577d9 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/dialogs/ChromatogramEditorDialog.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/dialogs/ChromatogramEditorDialog.java @@ -119,8 +119,7 @@ private void createComboViewer(Composite parent) { @Override public String getText(Object element) { - if(element instanceof IChromatogramSelection) { - IChromatogramSelection chromatogramSelection = (IChromatogramSelection)element; + if(element instanceof IChromatogramSelection chromatogramSelection) { String name = chromatogramSelection.getChromatogram().getName(); String type = ChromatogramDataSupport.getChromatogramType(chromatogramSelection); return getChromatogramLabel(name, type, "Editor"); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/dialogs/ClassifierDialog.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/dialogs/ClassifierDialog.java index ea7bff4e2a..bf8b69b2e5 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/dialogs/ClassifierDialog.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/dialogs/ClassifierDialog.java @@ -68,9 +68,9 @@ public List getValue() { public IContentProposal[] getProposals(String contents, int position) { if(proposals == null) { - if(classifiable instanceof IChromatogramPeak) { + if(classifiable instanceof IChromatogramPeak chromatogramPeak) { Set treeSetClassifier = new TreeSet<>(); - IChromatogram chromatogram = ((IChromatogramPeak)classifiable).getChromatogram(); + IChromatogram chromatogram = chromatogramPeak.getChromatogram(); for(IPeak peak : chromatogram.getPeaks()) { treeSetClassifier.addAll(peak.getClassifier()); } @@ -111,7 +111,7 @@ protected void configureShell(Shell newShell) { private ListEdit createListEdit(Composite parent) { - ListEdit listEdit = new ListEdit<>(parent, this, new ListEditModel() { + return new ListEdit<>(parent, this, new ListEditModel() { @Override public Collection list() { @@ -141,7 +141,5 @@ public String create() { return null; } }); - // - return listEdit; } } \ No newline at end of file diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/dialogs/DataTypeDialog.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/dialogs/DataTypeDialog.java index d1cdba2df6..c5744ec52e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/dialogs/DataTypeDialog.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/dialogs/DataTypeDialog.java @@ -107,8 +107,8 @@ private ComboViewer createComboViewer(Composite parent) { @Override public String getText(Object element) { - if(element instanceof DataType) { - return ((DataType)element).name(); + if(element instanceof DataType dataType) { + return dataType.name(); } // return null; @@ -126,7 +126,6 @@ public void widgetSelected(SelectionEvent e) { Object object = comboViewer.getStructuredSelection().getFirstElement(); if(object instanceof DataType) { - dataType = (DataType)object; validate(); } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/dialogs/InternalStandardDialog.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/dialogs/InternalStandardDialog.java index 6e082985ee..3aa9be0610 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/dialogs/InternalStandardDialog.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/dialogs/InternalStandardDialog.java @@ -25,7 +25,6 @@ public class InternalStandardDialog extends Dialog { private IPeak peak; - private ExtendedInternalStandardsUI extendedInternalStandardsUI; public InternalStandardDialog(Shell shell, IPeak peak) { @@ -52,7 +51,7 @@ protected Control createDialogArea(Composite parent) { Composite composite = (Composite)super.createDialogArea(parent); composite.setLayout(new GridLayout(1, true)); // - extendedInternalStandardsUI = createExtendedInternalStandardsUI(composite); + ExtendedInternalStandardsUI extendedInternalStandardsUI = createExtendedInternalStandardsUI(composite); extendedInternalStandardsUI.update(peak); // return composite; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/AbstractChromatogramEditor.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/AbstractChromatogramEditor.java index 886929fa69..cd015a973f 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/AbstractChromatogramEditor.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/AbstractChromatogramEditor.java @@ -59,6 +59,8 @@ import org.eclipse.chemclipse.ux.extension.xxd.ui.charts.ChromatogramChart; import org.eclipse.chemclipse.ux.extension.xxd.ui.internal.editors.ChromatogramFileSupport; import org.eclipse.chemclipse.ux.extension.xxd.ui.internal.runnables.ChromatogramImportRunnable; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.part.support.MeasurementResultNotification; import org.eclipse.chemclipse.ux.extension.xxd.ui.part.support.ObjectChangedListener; import org.eclipse.chemclipse.ux.extension.xxd.ui.part.support.ProcessMethodNotifications; @@ -92,7 +94,7 @@ public abstract class AbstractChromatogramEditor extends AbstractUpdater map = new HashMap(); + part.setLabel(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CHROMATOGRAM)); + Map map = new HashMap<>(); map.put(EditorSupport.MAP_FILE, file.getAbsolutePath()); map.put(EditorSupport.MAP_BATCH, false); part.setObject(map); - part.setTooltip("Chromatogram from Project Explorer"); + part.setTooltip(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CHROMATOGRAM_FROM_PROJECT_EXPLORER)); } else { throw new PartInitException("The file could't be loaded."); } @@ -152,8 +153,7 @@ private DataType getDataType() { DataType dataType = null; // Object object = part.getObject(); - if(object instanceof Map) { - Map map = (Map)object; + if(object instanceof Map map) { String path = (String)map.get(EditorSupport.MAP_FILE); File file = new File(path); // diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ChromatogramEditorCSD.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ChromatogramEditorCSD.java index e654da9215..4c2684fc5d 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ChromatogramEditorCSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ChromatogramEditorCSD.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 Lablicate GmbH. + * e * Copyright (c) 2018, 2020 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ChromatogramEditorTSD.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ChromatogramEditorTSD.java index c1077f102e..b85b178cbe 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ChromatogramEditorTSD.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ChromatogramEditorTSD.java @@ -26,6 +26,8 @@ import org.eclipse.chemclipse.support.ui.workbench.EditorSupport; import org.eclipse.chemclipse.tsd.model.core.IChromatogramTSD; import org.eclipse.chemclipse.ux.extension.ui.editors.IChemClipseEditor; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.runnables.ImportRunnableTSD; import org.eclipse.chemclipse.ux.extension.xxd.ui.swt.editors.ChromatogramHeatmapUI; import org.eclipse.e4.ui.di.Focus; @@ -47,7 +49,7 @@ public class ChromatogramEditorTSD implements IChemClipseEditor { public static final String ID = "org.eclipse.chemclipse.ux.extension.xxd.ui.part.chromatogramEditorTSD"; public static final String CONTRIBUTION_URI = "bundleclass://org.eclipse.chemclipse.ux.extension.xxd.ui/org.eclipse.chemclipse.ux.extension.xxd.ui.editors.ChromatogramEditorTSD"; public static final String ICON_URI = IApplicationImage.getLocation(IApplicationImage.IMAGE_CHROMATOGRAM_TSD, IApplicationImageProvider.SIZE_16x16); - public static final String TOOLTIP = "Chromatogram Editor (TSD)"; + public static final String TOOLTIP = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.QUANTITATION_EDITOR_TSD); // private final MPart part; private final MDirtyable dirtyable; @@ -55,7 +57,6 @@ public class ChromatogramEditorTSD implements IChemClipseEditor { private final MApplication application; // private File chromatogramFile; - private IChromatogramTSD chromatogramTSD; private ChromatogramHeatmapUI chromatogramHeatmapUI; // private final Shell shell; @@ -122,7 +123,7 @@ public boolean saveAs() { private void initialize(Composite parent) { createEditorPages(parent); - chromatogramTSD = loadChromatogram(); + IChromatogramTSD chromatogramTSD = loadChromatogram(); chromatogramHeatmapUI.setInput(chromatogramTSD); } @@ -152,12 +153,13 @@ private IChromatogramTSD loadChromatogram(File file, boolean batch) { /* * No fork, otherwise it might crash when loading the data takes too long. */ - boolean fork = (batch) ? false : true; + boolean fork = !batch; dialog.run(fork, false, runnable); } catch(InvocationTargetException e) { logger.warn(e); } catch(InterruptedException e) { logger.warn(e); + Thread.currentThread().interrupt(); } // chromatogramFile = file; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/PlateEditorPCR.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/PlateEditorPCR.java index ecc21dd64c..f83b534f11 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/PlateEditorPCR.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/PlateEditorPCR.java @@ -193,6 +193,7 @@ private IPlate loadPlate(File file, boolean batch) { logger.warn(e); } catch(InterruptedException e) { logger.warn(e); + Thread.currentThread().interrupt(); } // plateFile = file; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ProcessMethodEditor.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ProcessMethodEditor.java index 1932e11eea..641009eda7 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ProcessMethodEditor.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ProcessMethodEditor.java @@ -128,12 +128,16 @@ public void initialize(Composite parent) { processMethodFile = new File((String)map.get(EditorSupport.MAP_FILE)); currentProcessMethod = Adapters.adapt(processMethodFile, IProcessMethod.class); } else { - currentProcessMethod = null; processMethodFile = null; } /* * Backward compatibility */ + if(currentProcessMethod == null) { + String message = "The current process method was not adapted correctly."; + logger.warn(message); + throw new RuntimeException(message); + } DataCategory[] categories = currentProcessMethod.getDataCategories().toArray(new DataCategory[]{}); if(categories == null || categories.length == 0) { categories = new DataCategory[]{DataCategory.CSD, DataCategory.MSD, DataCategory.WSD}; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/QuantitationDatabaseEditor.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/QuantitationDatabaseEditor.java index 522e9d3662..5426421568 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/QuantitationDatabaseEditor.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/QuantitationDatabaseEditor.java @@ -30,6 +30,8 @@ import org.eclipse.chemclipse.support.ui.workbench.EditorSupport; import org.eclipse.chemclipse.ux.extension.ui.editors.IQuantitationDatabaseEditor; import org.eclipse.chemclipse.ux.extension.xxd.ui.internal.runnables.QuantDBImportRunnable; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.swt.editors.ExtendedQuantCompoundListUI; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.e4.ui.di.Focus; @@ -51,7 +53,7 @@ public class QuantitationDatabaseEditor implements IQuantitationDatabaseEditor { public static final String ID = "org.eclipse.chemclipse.ux.extension.xxd.ui.part.quantitationDatabaseEditor"; public static final String CONTRIBUTION_URI = "bundleclass://org.eclipse.chemclipse.ux.extension.xxd.ui/org.eclipse.chemclipse.ux.extension.xxd.ui.editors.QuantitationDatabaseEditor"; public static final String ICON_URI = IApplicationImage.getLocation(IApplicationImage.IMAGE_DATABASE, IApplicationImageProvider.SIZE_16x16); - public static final String TOOLTIP = "Quantitation Editor"; + public static final String TOOLTIP = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.QUANTITATION_EDITOR); // private final MPart part; private final MDirtyable dirtyable; @@ -184,12 +186,13 @@ private IQuantitationDatabase loadQuantitationDatabase(File file, boolean batch) /* * No fork, otherwise it might crash when loading the data takes too long. */ - boolean fork = (batch) ? false : true; + boolean fork = !batch; dialog.run(fork, false, runnable); } catch(InvocationTargetException e) { logger.warn(e); } catch(InterruptedException e) { logger.warn(e); + Thread.currentThread().interrupt(); } // quantitationDatabaseFile = file; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ScanEditorNMR.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ScanEditorNMR.java index 3588eda491..f3a953a4c0 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ScanEditorNMR.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ScanEditorNMR.java @@ -47,11 +47,15 @@ import org.eclipse.chemclipse.processing.ProcessorFactory; import org.eclipse.chemclipse.processing.core.DefaultProcessingResult; import org.eclipse.chemclipse.processing.core.IProcessingInfo; +import org.eclipse.chemclipse.processing.core.IProcessingMessage; +import org.eclipse.chemclipse.processing.core.MessageType; import org.eclipse.chemclipse.processing.filter.Filter; import org.eclipse.chemclipse.processing.filter.FilterContext; import org.eclipse.chemclipse.processing.filter.Filtered; import org.eclipse.chemclipse.processing.supplier.IProcessSupplierContext; import org.eclipse.chemclipse.processing.ui.support.ProcessingInfoPartSupport; +import org.eclipse.chemclipse.progress.core.InfoType; +import org.eclipse.chemclipse.progress.core.StatusLineLogger; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider; import org.eclipse.chemclipse.support.events.IChemClipseEvents; @@ -61,6 +65,8 @@ import org.eclipse.chemclipse.swt.ui.notifier.UpdateNotifierUI; import org.eclipse.chemclipse.ux.extension.ui.editors.IScanEditorNMR; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.preferences.PreferencePageProcessors; import org.eclipse.chemclipse.ux.extension.xxd.ui.swt.DynamicSettingsUI; import org.eclipse.chemclipse.ux.extension.xxd.ui.swt.NMRMeasurementsUI; @@ -93,7 +99,7 @@ public class ScanEditorNMR implements IScanEditorNMR { public static final String ID = "org.eclipse.chemclipse.ux.extension.xxd.ui.part.scanEditorNMR"; public static final String CONTRIBUTION_URI = "bundleclass://org.eclipse.chemclipse.ux.extension.xxd.ui/org.eclipse.chemclipse.ux.extension.xxd.ui.editors.ScanEditorNMR"; public static final String ICON_URI = IApplicationImage.getLocation(IApplicationImage.IMAGE_SCAN_NMR, IApplicationImageProvider.SIZE_16x16); - public static final String TOOLTIP = "NMR Editor"; + public static final String TOOLTIP = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NMR_EDITOR); // private final ExecutorService executorService = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue(2)); // @@ -222,6 +228,7 @@ public void run() { e.printStackTrace(); } catch(InterruptedException e) { e.printStackTrace(); + Thread.currentThread().interrupt(); } } if(object instanceof IComplexSignalMeasurement) { @@ -287,8 +294,7 @@ public void selectionChanged(SelectionChangedEvent event) { if(measurement instanceof Filtered) { FilterContext context = ((Filtered)measurement).getFilterContext(); Object filteredObject = context.getFilteredObject(); - if(filteredObject instanceof IComplexSignalMeasurement) { - IComplexSignalMeasurement original = (IComplexSignalMeasurement)filteredObject; + if(filteredObject instanceof IComplexSignalMeasurement original) { settingsUI.setActiveContext(context, new UpdatingObserver(context, measurement, original)); composite.layout(); return; @@ -352,10 +358,8 @@ public void run() { Collection filterIMeasurements = measurementFilter.filterIMeasurements(Collections.singleton(originalMeasurement), config, Function.identity(), result, null); if(!filterIMeasurements.isEmpty() && !result.hasErrorMessages()) { for(IMeasurement measurement : filterIMeasurements) { - if(measurement instanceof IComplexSignalMeasurement) { - IComplexSignalMeasurement signalMeasurement = (IComplexSignalMeasurement)measurement; - if(measurement instanceof Filtered) { - Filtered filtered = (Filtered)measurement; + if(measurement instanceof IComplexSignalMeasurement signalMeasurement) { + if(measurement instanceof Filtered filtered) { if(filtered.getFilterContext().getFilteredObject() == originalMeasurement) { copySignals(signalMeasurement, currentMeasurement); } @@ -364,7 +368,11 @@ public void run() { } Display.getDefault().asyncExec(ScanEditorNMR.this.extendedNMRScanUI::updateScan); } else { - // TODO show an error decoration + for(IProcessingMessage message : result.getMessages()) { + if(message.getMessageType() == MessageType.ERROR) { + StatusLineLogger.setInfo(InfoType.ERROR_MESSAGE, message.getMessage()); + } + } } } catch(Exception e) { e.printStackTrace(); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ScanEditorXIR.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ScanEditorXIR.java index 84f6efad3c..a43266ec2d 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ScanEditorXIR.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/ScanEditorXIR.java @@ -30,6 +30,8 @@ import org.eclipse.chemclipse.swt.ui.notifier.UpdateNotifierUI; import org.eclipse.chemclipse.ux.extension.ui.editors.IScanEditorXIR; import org.eclipse.chemclipse.ux.extension.xxd.ui.internal.runnables.ScanXIRImportRunnable; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.swt.editors.ExtendedXIRScanUI; import org.eclipse.chemclipse.xir.model.core.IScanXIR; import org.eclipse.e4.ui.di.Focus; @@ -52,7 +54,7 @@ public class ScanEditorXIR implements IScanEditorXIR { public static final String ID = "org.eclipse.chemclipse.ux.extension.xxd.ui.part.scanEditorXIR"; public static final String CONTRIBUTION_URI = "bundleclass://org.eclipse.chemclipse.ux.extension.xxd.ui/org.eclipse.chemclipse.ux.extension.xxd.ui.editors.ScanEditorXIR"; public static final String ICON_URI = IApplicationImage.getLocation(IApplicationImage.IMAGE_SCAN_XIR, IApplicationImageProvider.SIZE_16x16); - public static final String TOOLTIP = "FTIR/NIR/MIR Editor"; + public static final String TOOLTIP = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.XIR_EDITOR); // private final MPart part; private final MDirtyable dirtyable; @@ -112,6 +114,7 @@ public void run() { @Persist public void save() { + // TODO System.out.println(scanFile); dirtyable.setDirty(false); } @@ -166,7 +169,7 @@ private IScanXIR loadScan(File file, boolean batch) { /* * No fork, otherwise it might crash when loading the data takes too long. */ - boolean fork = (batch) ? false : true; + boolean fork = !batch; dialog.run(fork, false, runnable); } catch(InvocationTargetException e) { logger.warn(e); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/SequenceEditor.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/SequenceEditor.java index f1fe4aa683..bdfb5b216a 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/SequenceEditor.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/SequenceEditor.java @@ -32,6 +32,8 @@ import org.eclipse.chemclipse.support.ui.workbench.DisplayUtils; import org.eclipse.chemclipse.support.ui.workbench.EditorSupport; import org.eclipse.chemclipse.ux.extension.xxd.ui.internal.runnables.SequenceImportRunnable; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.swt.editors.ExtendedSequenceListUI; import org.eclipse.e4.ui.di.Focus; import org.eclipse.e4.ui.di.Persist; @@ -52,7 +54,7 @@ public class SequenceEditor { public static final String ID = "org.eclipse.chemclipse.ux.extension.xxd.ui.part.sequenceEditor"; public static final String CONTRIBUTION_URI = "bundleclass://org.eclipse.chemclipse.ux.extension.xxd.ui/org.eclipse.chemclipse.ux.extension.xxd.ui.editors.SequenceEditor"; public static final String ICON_URI = IApplicationImage.getLocation(IApplicationImage.IMAGE_SEQUENCE_LIST_DEFAULT, IApplicationImageProvider.SIZE_16x16); - public static final String TOOLTIP = "Sequence Editor"; + public static final String TOOLTIP = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SEQUENCE_EDITOR); // private final MPart part; private final MDirtyable dirtyable; @@ -104,6 +106,7 @@ public void run() { @Persist public void save() { + // TODO System.out.println(sequenceFile); dirtyable.setDirty(false); } @@ -153,7 +156,7 @@ private synchronized ISequence loadSequence(File file /* * No fork, otherwise it might crash when loading a chromatogram takes too long. */ - boolean fork = (batch) ? false : true; + boolean fork = !batch; dialog.run(fork, false, runnable); sequence = runnable.getSequence(); sequenceFile = file; @@ -161,6 +164,7 @@ private synchronized ISequence loadSequence(File file logger.warn(e); } catch(InterruptedException e) { logger.warn(e); + Thread.currentThread().interrupt(); } // return sequence; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/fieldeditors/ColorCodesFieldEditor.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/fieldeditors/ColorCodesFieldEditor.java index 9e88f44a07..3745cdcbd4 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/fieldeditors/ColorCodesFieldEditor.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/fieldeditors/ColorCodesFieldEditor.java @@ -41,6 +41,7 @@ public class ColorCodesFieldEditor extends FieldEditor { private ColorCodeTableUI colorCodeTableUI; public ColorCodesFieldEditor(String name, String labelText, Composite parent) { + init(name, labelText); createControl(parent); } @@ -137,8 +138,7 @@ public void widgetSelected(SelectionEvent e) { IStructuredSelection structuredSelection = (IStructuredSelection)colorCodeTableUI.getSelection(); Object object = structuredSelection.getFirstElement(); - if(object instanceof ColorCode) { - ColorCode colorCode = (ColorCode)object; + if(object instanceof ColorCode colorCode) { ColorCodeDialog dialog = new ColorCodeDialog(e.display.getActiveShell(), colorCode); if(IDialogConstants.OK_ID == dialog.open()) { colorCode = dialog.getColorCode(); @@ -167,8 +167,7 @@ public void widgetSelected(SelectionEvent e) { List removeKeys = new ArrayList<>(); IStructuredSelection structuredSelection = (IStructuredSelection)colorCodeTableUI.getSelection(); for(Object object : structuredSelection.toArray()) { - if(object instanceof ColorCode) { - ColorCode colorCode = (ColorCode)object; + if(object instanceof ColorCode colorCode) { removeKeys.add(colorCode.getName()); } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/filter/ChromatogramFilterAdjust.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/filter/ChromatogramFilterAdjust.java index 10a0666bfe..6748fa54bd 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/filter/ChromatogramFilterAdjust.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/filter/ChromatogramFilterAdjust.java @@ -20,6 +20,8 @@ import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.support.events.IChemClipseEvents; import org.eclipse.chemclipse.swt.ui.notifier.UpdateNotifierUI; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.swt.widgets.Display; @@ -33,8 +35,8 @@ public IProcessingInfo applyFilter(IChromatogramSelection chromatogramSelection, IProcessingInfo processingInfo = validate(chromatogramSelection, chromatogramFilterSettings); if(!processingInfo.hasErrorMessages()) { if(chromatogramFilterSettings instanceof FilterSettingsAdjust) { - UpdateNotifierUI.update(Display.getDefault(), IChemClipseEvents.TOPIC_EDITOR_CHROMATOGRAM_ADJUST, "Adjust the chromatogram editor UI."); - processingInfo.setProcessingResult(new ChromatogramFilterResult(ResultStatus.OK, "The chromatogram editor has been reset.")); + UpdateNotifierUI.update(Display.getDefault(), IChemClipseEvents.TOPIC_EDITOR_CHROMATOGRAM_ADJUST, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.ADJUST_CHROMATOGRAM_EDITOR)); + processingInfo.setProcessingResult(new ChromatogramFilterResult(ResultStatus.OK, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CHROMATOGRAM_EDITOR_RESET))); } } // diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/handlers/AbstractOpenHandler.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/handlers/AbstractOpenHandler.java index 0af7334e8e..3deb03f9ff 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/handlers/AbstractOpenHandler.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/handlers/AbstractOpenHandler.java @@ -23,6 +23,8 @@ import org.eclipse.chemclipse.processing.converter.ISupplierFileIdentifier; import org.eclipse.chemclipse.ux.extension.ui.provider.ISupplierFileEditorSupport; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.wizards.InputEntriesWizard; import org.eclipse.chemclipse.ux.extension.xxd.ui.wizards.InputWizardSettings; import org.eclipse.e4.core.di.annotations.Execute; @@ -36,16 +38,16 @@ public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell) { DataType dataType = getDataType(); InputWizardSettings inputWizardSettings = InputWizardSettings.create(Activator.getDefault().getPreferenceStore(), getPreferenceKey(), getDataType()); - inputWizardSettings.setTitle("Open " + dataType + " Files"); - inputWizardSettings.setDescription("You can select one or more files to be opened."); + inputWizardSettings.setTitle("Open " + dataType + " Files"); // TODO: l10n + inputWizardSettings.setDescription(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SELECT_FILES_TO_BE_OPENED)); Map>> selected = InputEntriesWizard.openWizard(shell, inputWizardSettings); for(Entry>> entry : selected.entrySet()) { File file = entry.getKey(); for(Entry> supplier : entry.getValue().entrySet()) { ISupplierFileIdentifier identifier = supplier.getKey(); - if(identifier instanceof ISupplierFileEditorSupport) { + if(identifier instanceof ISupplierFileEditorSupport supplierFileEditor) { for(ISupplier converter : supplier.getValue()) { - if(((ISupplierFileEditorSupport)identifier).openEditor(file, converter)) { + if(supplierFileEditor.openEditor(file, converter)) { break; } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/handlers/CreateProcessMethodHandler.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/handlers/CreateProcessMethodHandler.java index 268ce05b89..578a05672e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/handlers/CreateProcessMethodHandler.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/handlers/CreateProcessMethodHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Lablicate GmbH. + * Copyright (c) 2019, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -21,6 +21,8 @@ import org.eclipse.chemclipse.processing.DataCategoryGroup; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.part.support.SupplierEditorSupport; import org.eclipse.chemclipse.ux.extension.xxd.ui.wizards.DataTypeTypeSelectionWizard; import org.eclipse.core.runtime.NullProgressMonitor; @@ -34,17 +36,18 @@ public class CreateProcessMethodHandler { private static final String FILTER_EXTENSION = "*.ocm"; - private static final String FILTER_NAME = "Process Method (*.ocm)"; - private static final String FILE_NAME = "myprocessmethod.ocm"; + private static final String PROCESS_METHOD = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROCESS_METHOD); + private static final String FILTER_NAME = PROCESS_METHOD + "(" + FILTER_EXTENSION + ")"; + private static final String FILE_NAME = PROCESS_METHOD + FILTER_EXTENSION; @Execute public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell, IEclipseContext eclipseContext) { - DataCategoryGroup dataCategoryGroup = DataTypeTypeSelectionWizard.open(shell, "Please choose the desired categories to create a new method.", Activator.getDefault().getPreferenceStore()); + DataCategoryGroup dataCategoryGroup = DataTypeTypeSelectionWizard.open(shell, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CHOOSE_DESIRED_CATEGORIES_TO_CREATE_NEW_METHOD), Activator.getDefault().getPreferenceStore()); if(dataCategoryGroup != null) { FileDialog fileDialog = new FileDialog(shell, SWT.SAVE); fileDialog.setOverwrite(true); - fileDialog.setText("Process Method"); + fileDialog.setText(PROCESS_METHOD); fileDialog.setFilterExtensions(new String[]{FILTER_EXTENSION}); fileDialog.setFilterNames(new String[]{FILTER_NAME}); fileDialog.setFileName(FILE_NAME); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/instruments/InstrumentsSettingsEditor.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/instruments/InstrumentsSettingsEditor.java index 4554b1bb1a..8e976338e9 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/instruments/InstrumentsSettingsEditor.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/instruments/InstrumentsSettingsEditor.java @@ -24,9 +24,12 @@ import org.eclipse.chemclipse.processing.supplier.IProcessorPreferences; import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; +import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider; import org.eclipse.chemclipse.swt.ui.components.ISearchListener; import org.eclipse.chemclipse.swt.ui.components.SearchSupportUI; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.methods.SettingsUIProvider; import org.eclipse.chemclipse.ux.extension.xxd.ui.preferences.PreferenceConstants; import org.eclipse.chemclipse.ux.extension.xxd.ui.swt.IExtendedPartUI; @@ -54,9 +57,16 @@ public class InstrumentsSettingsEditor implements SettingsUIProvider.SettingsUIControl, IExtendedPartUI { private static final String FILTER_EXTENSION = "*.txt"; - private static final String FILTER_NAME = "Instruments (*.txt)"; - private static final String FILE_NAME = "Instruments.txt"; - private static final String TITLE = "Instrument"; + private static final String INSTRUMENTS = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.INSTRUMENTS); + private static final String FILTER_NAME = INSTRUMENTS + "(" + FILTER_EXTENSION + ")"; + private static final String FILE_NAME = INSTRUMENTS + FILTER_EXTENSION; + private static final String TITLE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.INSTRUMENT); + private static final String CREATE_NEW_INSTRUMENT = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CREATE_NEW_INSTRUMENT); + private static final String EDIT_SELECTED_INSTRUMENT = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.EDIT_SELECTED_INSTRUMENT); + private static final String REMOVE_SELECTED_INSTRUMENT = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.REMOVE_SELECTED_INSTRUMENT); + private static final String REALLY_DELETE_SELECTED_INSTRUMENT = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.REALLY_DELETE_SELECTED_INSTRUMENT); + private static final String REMOVE_ALL_INSTRUMENTS = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.REMOVE_ALL_INSTRUMENTS); + private static final String REALLY_REMOVE_ALL_INSTRUMENTS = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.REALLY_REMOVE_ALL_INSTRUMENTS); // private Composite control; // @@ -201,13 +211,13 @@ private Button createButtonAdd(Composite parent) { Button button = new Button(parent, SWT.PUSH); button.setText(""); - button.setToolTipText("Add a new instrument."); - button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_ADD, IApplicationImage.SIZE_16x16)); + button.setToolTipText(CREATE_NEW_INSTRUMENT); + button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_ADD, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { - InputDialog dialog = new InputDialog(e.display.getActiveShell(), TITLE, "Create a new instrument.", "Instrument1 | GC-MS | Used for research and development.", new InstrumentInputValidator(settings.keySet())); + InputDialog dialog = new InputDialog(e.display.getActiveShell(), TITLE, CREATE_NEW_INSTRUMENT, "Instrument1 | GC-MS | Used for research and development.", new InstrumentInputValidator(settings.keySet())); if(IDialogConstants.OK_ID == dialog.open()) { String item = dialog.getValue(); Instrument instrument = settings.extractInstrument(item); @@ -226,20 +236,19 @@ private Button createButtonEdit(Composite parent) { Button button = new Button(parent, SWT.PUSH); button.setText(""); - button.setToolTipText("Edit the selected instrument."); - button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_EDIT, IApplicationImage.SIZE_16x16)); + button.setToolTipText(EDIT_SELECTED_INSTRUMENT); + button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_EDIT, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { IStructuredSelection structuredSelection = (IStructuredSelection)listUI.getSelection(); Object object = structuredSelection.getFirstElement(); - if(object instanceof Instrument) { + if(object instanceof Instrument instrument) { Set keySetEdit = new HashSet<>(); keySetEdit.addAll(settings.keySet()); - Instrument instrument = (Instrument)object; keySetEdit.remove(instrument.getIdentifier()); - InputDialog dialog = new InputDialog(e.display.getActiveShell(), TITLE, "Edit the selected instrument.", settings.extractInstrument(instrument), new InstrumentInputValidator(keySetEdit)); + InputDialog dialog = new InputDialog(e.display.getActiveShell(), TITLE, EDIT_SELECTED_INSTRUMENT, settings.extractInstrument(instrument), new InstrumentInputValidator(keySetEdit)); if(IDialogConstants.OK_ID == dialog.open()) { String item = dialog.getValue(); Instrument instrumentNew = settings.extractInstrument(item); @@ -260,17 +269,17 @@ private Button createButtonRemove(Composite parent) { Button button = new Button(parent, SWT.PUSH); button.setText(""); - button.setToolTipText("Remove the selected instrument(s)."); - button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_DELETE, IApplicationImage.SIZE_16x16)); + button.setToolTipText(REMOVE_SELECTED_INSTRUMENT); + button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_DELETE, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { - if(MessageDialog.openQuestion(e.display.getActiveShell(), TITLE, "Do you want to delete the selected instrument(s)?")) { + if(MessageDialog.openQuestion(e.display.getActiveShell(), TITLE, REALLY_DELETE_SELECTED_INSTRUMENT)) { IStructuredSelection structuredSelection = (IStructuredSelection)listUI.getSelection(); for(Object object : structuredSelection.toArray()) { - if(object instanceof Instrument) { - settings.remove(((Instrument)object).getIdentifier()); + if(object instanceof Instrument instrument) { + settings.remove(instrument.getIdentifier()); } } setTableViewerInput(); @@ -285,13 +294,13 @@ private Button createButtonRemoveAll(Composite parent) { Button button = new Button(parent, SWT.PUSH); button.setText(""); - button.setToolTipText("Remove all instrument(s)."); - button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_DELETE_ALL, IApplicationImage.SIZE_16x16)); + button.setToolTipText(REMOVE_ALL_INSTRUMENTS); + button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_DELETE_ALL, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { - if(MessageDialog.openQuestion(e.display.getActiveShell(), TITLE, "Do you want to delete all instrument(s)?")) { + if(MessageDialog.openQuestion(e.display.getActiveShell(), TITLE, REALLY_REMOVE_ALL_INSTRUMENTS)) { settings.clear(); setTableViewerInput(); } @@ -305,14 +314,14 @@ private Button createButtonImport(Composite parent) { Button button = new Button(parent, SWT.PUSH); button.setText(""); - button.setToolTipText("Import an instrument list."); - button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_IMPORT, IApplicationImage.SIZE_16x16)); + button.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.IMPORT_INSTRUMENT_LIST)); + button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_IMPORT, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { FileDialog fileDialog = new FileDialog(e.widget.getDisplay().getActiveShell(), SWT.READ_ONLY); - fileDialog.setText("Instrument List"); + fileDialog.setText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.INSTRUMENT_LIST)); fileDialog.setFilterExtensions(new String[]{FILTER_EXTENSION}); fileDialog.setFilterNames(new String[]{FILTER_NAME}); fileDialog.setFilterPath(preferenceStore.getString(PreferenceConstants.P_INSTRUMENTS_TEMPLATE_FOLDER)); @@ -334,15 +343,15 @@ private Button createButtonExport(Composite parent) { Button button = new Button(parent, SWT.PUSH); button.setText(""); - button.setToolTipText("Export the instrument list."); - button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_EXPORT, IApplicationImage.SIZE_16x16)); + button.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.EXPORT_INSTRUMENT_LIST)); + button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_EXPORT, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { FileDialog fileDialog = new FileDialog(e.widget.getDisplay().getActiveShell(), SWT.SAVE); fileDialog.setOverwrite(true); - fileDialog.setText("Instrument List"); + fileDialog.setText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.INSTRUMENT_LIST)); fileDialog.setFilterExtensions(new String[]{FILTER_EXTENSION}); fileDialog.setFilterNames(new String[]{FILTER_NAME}); fileDialog.setFileName(FILE_NAME); @@ -353,9 +362,9 @@ public void widgetSelected(SelectionEvent e) { String path = file.getParentFile().getAbsolutePath(); preferenceStore.putValue(PreferenceConstants.P_INSTRUMENTS_TEMPLATE_FOLDER, path); if(settings.exportItems(file)) { - MessageDialog.openInformation(button.getShell(), TITLE, "The instrument list has been exported successfully."); + MessageDialog.openInformation(button.getShell(), TITLE, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.INSTRUMENT_LIST_EXPORTED)); } else { - MessageDialog.openWarning(button.getShell(), TITLE, "Something went wrong to export the instrument list."); + MessageDialog.openWarning(button.getShell(), TITLE, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.INSTRUMENT_LIST_EXPORT_FAILED)); } } } @@ -368,8 +377,8 @@ private Button createButtonSave(Composite parent) { Button button = new Button(parent, SWT.PUSH); button.setText(""); - button.setToolTipText("Save the instrument list."); - button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_SAVE, IApplicationImage.SIZE_16x16)); + button.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SAVE_INSTRUMENT_LIST)); + button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_SAVE, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/editors/ProjectExplorerEditorSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/editors/ProjectExplorerEditorSupport.java index c0888406e0..8950f49525 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/editors/ProjectExplorerEditorSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/editors/ProjectExplorerEditorSupport.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -22,6 +22,7 @@ import org.eclipse.chemclipse.processing.converter.ISupplier; import org.eclipse.chemclipse.ux.extension.ui.provider.AbstractSupplierFileEditorSupport; import org.eclipse.chemclipse.ux.extension.ui.provider.ISupplierEditorSupport; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; @@ -38,16 +39,17 @@ public class ProjectExplorerEditorSupport extends AbstractSupplierFileEditorSupp private static final Logger logger = Logger.getLogger(ProjectExplorerEditorSupport.class); // private String type = ""; - private static final String DATA_EXPLORER = "Data Explorer"; + private static final String DATA_EXPLORER = IExtensionMessages.DATA_EXPLORER; public ProjectExplorerEditorSupport(DataType dataType) { + super(getSupplier(dataType)); initialize(dataType); } private static List getSupplier(DataType dataType) { - List supplier = new ArrayList(); + List supplier = new ArrayList<>(); switch(dataType) { case CAL: supplier.add(new CalibrationFileSupplier()); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/handlers/AbstractIdentificationsHandler.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/handlers/AbstractIdentificationsHandler.java index a3dc78ddf3..22b736c7c8 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/handlers/AbstractIdentificationsHandler.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/handlers/AbstractIdentificationsHandler.java @@ -17,6 +17,8 @@ import org.eclipse.chemclipse.model.core.IPeak; import org.eclipse.chemclipse.model.core.IScan; import org.eclipse.chemclipse.model.selection.IChromatogramSelection; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.support.charts.ChromatogramDataSupport; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.MessageBox; @@ -38,7 +40,7 @@ public void deleteIdentifications(Shell shell, String text, boolean deleteChroma if(chromatogram != null) { MessageBox messageBox = new MessageBox(shell, SWT.ICON_WARNING | SWT.YES | SWT.NO | SWT.CANCEL); messageBox.setText(text); - messageBox.setMessage("Do you really want to delete the identifications?"); + messageBox.setMessage(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.REALLY_SAVE_IDENTIFICATIONS)); int decision = messageBox.open(); if(SWT.YES == decision) { /* diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/handlers/RedoOperationHandler.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/handlers/RedoOperationHandler.java index 58083b2eab..2248462859 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/handlers/RedoOperationHandler.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/handlers/RedoOperationHandler.java @@ -19,6 +19,8 @@ import org.eclipse.chemclipse.progress.core.StatusLineLogger; import org.eclipse.chemclipse.rcp.app.undo.UndoContextFactory; import org.eclipse.chemclipse.support.ui.workbench.DisplayUtils; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IOperationHistory; import org.eclipse.core.commands.operations.IUndoContext; @@ -62,10 +64,10 @@ public void run() { operationHistory.redo(undoContext, null, null); } catch(ExecutionException e) { logger.warn(e); - StatusLineLogger.setInfo(InfoType.ERROR_MESSAGE, "Redo operation failed"); + StatusLineLogger.setInfo(InfoType.ERROR_MESSAGE, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.REDO_OPERATION_FAILED)); } finally { shell.setCursor(cursor); - StatusLineLogger.setInfo(InfoType.MESSAGE, "Redo operation finished"); + StatusLineLogger.setInfo(InfoType.MESSAGE, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.REDO_OPERATION_FINISHED)); } } }); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/handlers/UndoOperationHandler.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/handlers/UndoOperationHandler.java index 507cb57462..94a3588b4c 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/handlers/UndoOperationHandler.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/handlers/UndoOperationHandler.java @@ -19,6 +19,8 @@ import org.eclipse.chemclipse.progress.core.StatusLineLogger; import org.eclipse.chemclipse.rcp.app.undo.UndoContextFactory; import org.eclipse.chemclipse.support.ui.workbench.DisplayUtils; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IOperationHistory; import org.eclipse.core.commands.operations.IUndoContext; @@ -62,10 +64,10 @@ public void run() { operationHistory.undo(undoContext, null, null); } catch(ExecutionException e) { logger.warn(e); - StatusLineLogger.setInfo(InfoType.ERROR_MESSAGE, "Undo operation failed"); + StatusLineLogger.setInfo(InfoType.ERROR_MESSAGE, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.UNDO_OPERATION_FAILED)); } finally { shell.setCursor(cursor); - StatusLineLogger.setInfo(InfoType.MESSAGE, "Undo operation finished"); + StatusLineLogger.setInfo(InfoType.MESSAGE, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.UNDO_OPERATION_FINISHED)); } } }); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ChannelSpecificationLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ChannelSpecificationLabelProvider.java index 083ccb2716..1f84914e32 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ChannelSpecificationLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ChannelSpecificationLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -16,12 +16,14 @@ import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.swt.graphics.Image; public class ChannelSpecificationLabelProvider extends AbstractChemClipseLabelProvider { - public static final String NAME = "Name"; - public static final String VALUE = "Value"; + public static final String NAME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NAME); + public static final String VALUE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.VALUE); // public static final String[] TITLES = { // NAME, // diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ColorCodeDialog.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ColorCodeDialog.java index ba3b0138cc..410d54ca01 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ColorCodeDialog.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ColorCodeDialog.java @@ -13,6 +13,8 @@ import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.swt.ui.support.Colors; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.model.ColorCode; import org.eclipse.chemclipse.ux.extension.xxd.ui.model.ColorCodes; import org.eclipse.jface.dialogs.IDialogConstants; @@ -44,10 +46,12 @@ public class ColorCodeDialog extends TitleAreaDialog { private ColorCode colorCode; public ColorCodeDialog(Shell shell) { + this(shell, null); } public ColorCodeDialog(Shell shell, ColorCode colorCodePCR) { + super(shell); this.colorCode = colorCodePCR; } @@ -106,7 +110,7 @@ private void createTextElement(Composite parent) { textName = new Text(parent, SWT.BORDER); textName.setText((colorCode != null) ? colorCode.getName() : ""); - textName.setToolTipText("This is the field for the color code name."); + textName.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FIELD_FOR_COLOR_CODE_NAME)); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.grabExcessHorizontalSpace = true; gridData.widthHint = 300; @@ -125,7 +129,7 @@ private void createColorDisplayElement(Composite parent) { colorWidget = new Label(parent, SWT.BORDER); colorWidget.setText(""); - colorWidget.setToolTipText("This color is used."); + colorWidget.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COLOR_IS_USED)); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.grabExcessHorizontalSpace = true; gridData.widthHint = 150; @@ -137,14 +141,14 @@ private void createColorButtonElement(Composite parent) { Button button = new Button(parent, SWT.PUSH); button.setText("Color"); - button.setToolTipText("Select the color."); + button.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SELECT_COLOR)); button.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent event) { ColorDialog colorDialog = new ColorDialog(event.display.getActiveShell()); colorDialog.setRGB(colorWidget.getBackground().getRGB()); - colorDialog.setText("Select a color."); + colorDialog.setText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SELECT_COLOR)); RGB rgb = colorDialog.open(); if(rgb != null) { Color color = Colors.getColor(rgb); @@ -167,14 +171,15 @@ private void validate() { // String name = getName(); if(name.equals("")) { - setErrorMessage("A name must be specified."); + setErrorMessage(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NAME_MUST_BE_SPECIFIED)); getButton(OK).setEnabled(false); } else { + String NameMustNotContain = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NAME_MUST_NOT_CONTAIN); if(name.contains(ColorCodes.VALUE_DELIMITER)) { - setErrorMessage("The name must not contain: '" + ColorCodes.VALUE_DELIMITER + "'"); + setErrorMessage(NameMustNotContain + " '" + ColorCodes.VALUE_DELIMITER + "'"); getButton(OK).setEnabled(false); } else if(name.contains(ColorCodes.ENTRY_DELIMITER)) { - setErrorMessage("The name must not contain: '" + ColorCodes.ENTRY_DELIMITER + "'"); + setErrorMessage(NameMustNotContain + " '" + ColorCodes.ENTRY_DELIMITER + "'"); getButton(OK).setEnabled(false); } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ColorCodeLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ColorCodeLabelProvider.java index b727db3487..5661898413 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ColorCodeLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ColorCodeLabelProvider.java @@ -14,13 +14,15 @@ import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.model.ColorCode; import org.eclipse.swt.graphics.Image; public class ColorCodeLabelProvider extends AbstractChemClipseLabelProvider { - public static final String NAME = "Name"; - public static final String COLOR = "Color"; + public static final String NAME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NAME); + public static final String COLOR = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COLOR); // public static final int INDEX_COLOR = 1; // diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/HeaderDataEditingSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/HeaderDataEditingSupport.java index 0a6c01b583..307ac78ec9 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/HeaderDataEditingSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/HeaderDataEditingSupport.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -26,6 +26,7 @@ public class HeaderDataEditingSupport extends EditingSupport { private String column; public HeaderDataEditingSupport(HeaderDataListUI tableViewer, String column) { + super(tableViewer); this.column = column; if(column.equals(HeaderDataLabelProvider.VALUE)) { @@ -56,9 +57,8 @@ protected Object getValue(Object element) { if(element instanceof Map.Entry) { Map.Entry entry = (Map.Entry)element; - switch(column) { - case HeaderDataLabelProvider.VALUE: - return entry.getValue(); + if(column.equals(HeaderDataLabelProvider.VALUE)) { + return entry.getValue(); } } return false; @@ -72,10 +72,9 @@ protected void setValue(Object element, Object value) { IMeasurementInfo measurementInfo = tableViewer.getMeasurementInfo(); if(measurementInfo != null) { Map.Entry entry = (Map.Entry)element; - switch(column) { - case HeaderDataLabelProvider.VALUE: - measurementInfo.putHeaderData(entry.getKey(), (String)value); - break; + if(column.equals(HeaderDataLabelProvider.VALUE)) { + measurementInfo.putHeaderData(entry.getKey(), (String)value); + return; } tableViewer.refresh(); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/HeaderDataLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/HeaderDataLabelProvider.java index 308414e123..5814f3d5b2 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/HeaderDataLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/HeaderDataLabelProvider.java @@ -16,12 +16,14 @@ import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.swt.graphics.Image; public class HeaderDataLabelProvider extends AbstractChemClipseLabelProvider { - public static final String NAME = "Name"; - public static final String VALUE = "Value"; + public static final String NAME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NAME); + public static final String VALUE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.VALUE); // public static final int INDEX_COLUMN_NAME = 0; // diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/InstrumentEditingSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/InstrumentEditingSupport.java index dd963a4518..5d0b77e138 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/InstrumentEditingSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/InstrumentEditingSupport.java @@ -48,11 +48,11 @@ protected Object getValue(Object element) { if(element instanceof Instrument) { Instrument instrument = (Instrument)element; - switch(column) { - case InstrumentLabelProvider.NAME: - return instrument.getName(); - case InstrumentLabelProvider.DESCRIPTION: - return instrument.getDescription(); + if(column.equals(InstrumentLabelProvider.NAME)) { + return instrument.getName(); + } + if(column.equals(InstrumentLabelProvider.DESCRIPTION)) { + return instrument.getDescription(); } } return false; @@ -63,13 +63,11 @@ protected void setValue(Object element, Object value) { if(element instanceof Instrument) { Instrument instrument = (Instrument)element; - switch(column) { - case InstrumentLabelProvider.NAME: - instrument.setName((String)value); - break; - case InstrumentLabelProvider.DESCRIPTION: - instrument.setDescription((String)value); - break; + if(column.equals(InstrumentLabelProvider.NAME)) { + instrument.setName((String)value); + } + if(column.equals(InstrumentLabelProvider.DESCRIPTION)) { + instrument.setDescription((String)value); } tableViewer.refresh(); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/InstrumentLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/InstrumentLabelProvider.java index 156cec3e32..30c986830d 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/InstrumentLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/InstrumentLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Lablicate GmbH. + * Copyright (c) 2019, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -15,13 +15,15 @@ import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.swt.graphics.Image; public class InstrumentLabelProvider extends AbstractChemClipseLabelProvider { - public static final String IDENTIFIER = "Identifier"; - public static final String NAME = "Name"; - public static final String DESCRIPTION = "Description"; + public static final String IDENTIFIER = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.IDENTIFIER); + public static final String NAME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NAME); + public static final String DESCRIPTION = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.DESCRIPTION); // public static final String[] TITLES = { // IDENTIFIER, // diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/IntegrationAreaLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/IntegrationAreaLabelProvider.java index 1d99f8398f..e42da49b03 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/IntegrationAreaLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/IntegrationAreaLabelProvider.java @@ -18,13 +18,19 @@ import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.swt.graphics.Image; public class IntegrationAreaLabelProvider extends AbstractChemClipseLabelProvider { + public static final String AREA = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.AREA); + public static final String TRACE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TRACE); + // public static final String[] TITLES = { // - "Area", // - "Trace"}; + AREA, // + TRACE // + }; public static final int[] BOUNDS = { // 300, // 300 // @@ -35,9 +41,8 @@ public Image getColumnImage(Object element, int columnIndex) { if(columnIndex == 0) { return getImage(element); - } else { - return null; } + return null; } @Override @@ -61,6 +66,7 @@ public String getColumnText(Object element, int columnIndex) { return text; } + @Override public Image getImage(Object element) { return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_INTEGRATION_RESULTS, IApplicationImage.SIZE_16x16); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/InternalStandardEditingSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/InternalStandardEditingSupport.java index 72fcfff265..b008f10203 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/InternalStandardEditingSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/InternalStandardEditingSupport.java @@ -25,6 +25,7 @@ public class InternalStandardEditingSupport extends EditingSupport { private String column; public InternalStandardEditingSupport(ExtendedTableViewer tableViewer, String column) { + super(tableViewer); this.column = column; this.cellEditor = new TextCellEditor(tableViewer.getTable()); @@ -49,13 +50,11 @@ protected Object getValue(Object element) { Object object = null; if(element instanceof IInternalStandard) { IInternalStandard internalStandard = (IInternalStandard)element; - switch(column) { - case InternalStandardsLabelProvider.NAME: - object = internalStandard.getName(); - break; - case InternalStandardsLabelProvider.CHEMICAL_CLASS: - object = internalStandard.getChemicalClass(); - break; + if(column.equals(InternalStandardsLabelProvider.NAME)) { + object = internalStandard.getName(); + } + if(column.equals(InternalStandardsLabelProvider.CHEMICAL_CLASS)) { + object = internalStandard.getChemicalClass(); } } return object; @@ -66,17 +65,15 @@ protected void setValue(Object element, Object value) { if(element instanceof IInternalStandard) { IInternalStandard internalStandard = (IInternalStandard)element; - switch(column) { - case InternalStandardsLabelProvider.NAME: - String name = ((String)value).trim(); - if(isRenameAllowed(name)) { - internalStandard.setName(name); - } - break; - case InternalStandardsLabelProvider.CHEMICAL_CLASS: - String chemicalClass = ((String)value).trim(); - internalStandard.setChemicalClass(chemicalClass); - break; + if(column.equals(InternalStandardsLabelProvider.NAME)) { + String name = ((String)value).trim(); + if(isRenameAllowed(name)) { + internalStandard.setName(name); + } + } + if(column.equals(InternalStandardsLabelProvider.CHEMICAL_CLASS)) { + String chemicalClass = ((String)value).trim(); + internalStandard.setChemicalClass(chemicalClass); } tableViewer.refresh(); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/InternalStandardsLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/InternalStandardsLabelProvider.java index e6551d646d..d6fce11c9e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/InternalStandardsLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/InternalStandardsLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2016, 2018 Lablicate GmbH. + * Copyright (c) 2016, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -17,18 +17,23 @@ import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.swt.graphics.Image; public class InternalStandardsLabelProvider extends AbstractChemClipseLabelProvider { - public static final String NAME = "Name"; - public static final String CHEMICAL_CLASS = "Chemical Class"; + public static final String NAME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NAME); + public static final String CONCENTRATION = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CONCENTRATION); + public static final String UNIT = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.UNIT); + public static final String RESPONSE_FACTOR = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RESPONSE_FACTOR); + public static final String CHEMICAL_CLASS = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CHEMICAL_CLASS); // public static final String[] TITLES = {// NAME, // - "Concentration (Conc.)", // - "Concentration Unit", // - "Response Factor (RF)", // + CONCENTRATION, // + UNIT, // + RESPONSE_FACTOR, // CHEMICAL_CLASS // }; // @@ -41,6 +46,7 @@ public class InternalStandardsLabelProvider extends AbstractChemClipseLabelProvi }; public InternalStandardsLabelProvider() { + super("0.0##"); } @@ -49,9 +55,8 @@ public Image getColumnImage(Object element, int columnIndex) { if(columnIndex == 0) { return getImage(element); - } else { - return null; } + return null; } @Override @@ -84,6 +89,7 @@ public String getColumnText(Object element, int columnIndex) { return text; } + @Override public Image getImage(Object element) { return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_PEAK, IApplicationImage.SIZE_16x16); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/MethodListLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/MethodListLabelProvider.java index e4ec62ae88..33d4f34887 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/MethodListLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/MethodListLabelProvider.java @@ -24,6 +24,8 @@ import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.databinding.validation.ValidationStatus; import org.eclipse.core.runtime.IStatus; import org.eclipse.swt.graphics.Image; @@ -35,11 +37,11 @@ public class MethodListLabelProvider extends AbstractChemClipseLabelProvider { // public static final String[] TITLES = {// "", // - "Name", // - "Description", // - "Type", // - "Settings", // - "ID" // + ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NAME), // + ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.DESCRIPTION), // + ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TYPE), // + ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SETTINGS), // + ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.ID) // }; // public static final int[] BOUNDS = {// @@ -70,11 +72,14 @@ public Image getColumnImage(Object element, int columnIndex) { // if(status.matches(IStatus.ERROR)) { return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_STATUS_ERROR, IApplicationImage.SIZE_16x16); - } else if(status.matches(IStatus.WARNING)) { + } + if(status.matches(IStatus.WARNING)) { return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_STATUS_WARN, IApplicationImage.SIZE_16x16); - } else if(status.matches(IStatus.INFO)) { + } + if(status.matches(IStatus.INFO)) { return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_STATUS_EMPTY, IApplicationImage.SIZE_16x16); - } else if(status.isOK()) { + } + if(status.isOK()) { return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_STATUS_OK, IApplicationImage.SIZE_16x16); } } else if(element instanceof IProcessMethod) { @@ -124,21 +129,19 @@ public String getColumnText(Object element, int columnIndex) { if(processSupplier != null) { if(processSupplier.getSettingsParser().getInputValues().isEmpty() || preferencesSupplier == null) { return "not configurable"; - } else { - IProcessorPreferences preferences = preferencesSupplier.apply(processEntry, supplierContext); - if(preferences.isUseSystemDefaults()) { - return "defaults"; - } else { - String text = preferences.getUserSettingsAsString(); - if(text.startsWith("{")) { - text = text.substring(1); - } - if(text.endsWith("}")) { - text = text.substring(0, text.length() - 1); - } - return text.replace("\"", ""); - } } + IProcessorPreferences preferences = preferencesSupplier.apply(processEntry, supplierContext); + if(preferences.isUseSystemDefaults()) { + return "defaults"; + } + String text = preferences.getUserSettingsAsString(); + if(text.startsWith("{")) { + text = text.substring(1); + } + if(text.endsWith("}")) { + text = text.substring(0, text.length() - 1); + } + return text.replace("\"", ""); } break; case 5: @@ -173,42 +176,40 @@ private IStatus validate(IProcessEntry processEntry) { * Validation */ if(processEntry == null) { - return ValidationStatus.error("The processor is not available."); + return ValidationStatus.error(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROCESSOR_NOT_AVAILABLE)); } // if(preferencesSupplier == null) { - return ValidationStatus.error("The preference supplier is not available."); + return ValidationStatus.error(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PREFERENCES_SUPPLIER_NOT_AVAILABLE)); } // if(processTypeSupport == null) { - return ValidationStatus.error("The process type support is not available."); + return ValidationStatus.error(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROCESS_TYPE_SUPPORT_NOT_AVAILABLE)); } /* * Checks */ - if(!processEntry.isSkipValidation()) { - IProcessorPreferences processorPreferences = preferencesSupplier.apply(processEntry, processTypeSupport); - // - if(processorPreferences == null) { - return ValidationStatus.error("The processor " + processEntry.getName() + " preferences are not available."); - } - // - if(processorPreferences.getSupplier().getSettingsClass() == null) { - return ValidationStatus.warning("The processor " + processEntry.getName() + " has no settings class."); - } - // - if(processorPreferences.isUseSystemDefaults()) { - return ValidationStatus.info("The processor " + processEntry.getName() + " uses system default settings."); - } else { - try { - processorPreferences.getUserSettings(); - return ValidationStatus.ok(); - } catch(Exception e) { - return ValidationStatus.error("The processor " + processEntry.getName() + " settings can't be parsed.", e); - } - } - } else { - return ValidationStatus.info("The processor " + processEntry.getName() + " skip validation option is set."); + if(processEntry.isSkipValidation()) { + return ValidationStatus.info(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROCESSOR_SKIP_VALIDATION_OPTIOIN_SET, processEntry.getName())); + } + IProcessorPreferences processorPreferences = preferencesSupplier.apply(processEntry, processTypeSupport); + // + if(processorPreferences == null) { + return ValidationStatus.error(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROCESSOR_PREFERENCES_NOT_AVAILABLE, processEntry.getName())); + } + // + if(processorPreferences.getSupplier().getSettingsClass() == null) { + return ValidationStatus.warning(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROCESSOR_HAS_NO_SETTINGS_CLASS, processEntry.getName())); + } + // + if(processorPreferences.isUseSystemDefaults()) { + return ValidationStatus.info(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROCESSOR_USES_SYSTEM_DEFAULT_SETTINGS, processEntry.getName())); + } + try { + processorPreferences.getUserSettings(); + return ValidationStatus.ok(); + } catch(Exception e) { + return ValidationStatus.error(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROCESSOR_SETTINGS_CANNOT_BE_PARSED, processEntry.getName()), e); } } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/NamedTracesEditingSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/NamedTracesEditingSupport.java index 5898386139..487c934b17 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/NamedTracesEditingSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/NamedTracesEditingSupport.java @@ -28,6 +28,7 @@ public class NamedTracesEditingSupport extends EditingSupport { private TraceValidator traceValidator = new TraceValidator(); public NamedTracesEditingSupport(ExtendedTableViewer tableViewer, String column) { + super(tableViewer); this.column = column; this.cellEditor = new TextCellEditor(tableViewer.getTable()); @@ -51,9 +52,8 @@ protected Object getValue(Object element) { if(element instanceof NamedTrace) { NamedTrace namedTrace = (NamedTrace)element; - switch(column) { - case NamedTracesLabelProvider.TRACES: - return namedTrace.getTraces(); + if(column.equals(NamedTracesLabelProvider.TRACES)) { + return namedTrace.getTraces(); } } return false; @@ -64,13 +64,11 @@ protected void setValue(Object element, Object value) { if(element instanceof NamedTrace) { NamedTrace namedTrace = (NamedTrace)element; - switch(column) { - case NamedTracesLabelProvider.TRACES: - IStatus status = traceValidator.validate(value); - if(status.isOK()) { - namedTrace.setTraces(traceValidator.getTracesAsString()); - } - break; + if(column.equals(NamedTracesLabelProvider.TRACES)) { + IStatus status = traceValidator.validate(value); + if(status.isOK()) { + namedTrace.setTraces(traceValidator.getTracesAsString()); + } } tableViewer.refresh(); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/NamedTracesLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/NamedTracesLabelProvider.java index 93a74e1b98..4a4cc66694 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/NamedTracesLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/NamedTracesLabelProvider.java @@ -15,12 +15,14 @@ import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.swt.graphics.Image; public class NamedTracesLabelProvider extends AbstractChemClipseLabelProvider { - public static final String IDENTIFIER = "Identifier"; - public static final String TRACES = "Traces"; + public static final String IDENTIFIER = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.IDENTIFIER); + public static final String TRACES = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TRACES); // public static final String[] TITLES = { // IDENTIFIER, // diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakScanListEditingSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakScanListEditingSupport.java index fba0e17a9a..6a97f83177 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakScanListEditingSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakScanListEditingSupport.java @@ -58,9 +58,8 @@ protected boolean canEdit(Object element) { if(column.equals(PeakScanListLabelProvider.ACTIVE_FOR_ANALYSIS)) { return (element instanceof IPeak); - } else { - return tableViewer.isEditEnabled(); } + return tableViewer.isEditEnabled(); } @Override @@ -68,31 +67,35 @@ protected Object getValue(Object element) { if(element instanceof IPeak peak) { IPeakModel peakModel = peak.getPeakModel(); - switch(column) { - case PeakScanListLabelProvider.ACTIVE_FOR_ANALYSIS: - return peak.isActiveForAnalysis(); - case PeakScanListLabelProvider.RETENTION_TIME: - return decimalFormat.format(peakModel.getRetentionTimeAtPeakMaximum() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR); - case PeakScanListLabelProvider.RELATIVE_RETENTION_TIME: - return decimalFormat.format(peakModel.getPeakMaximum().getRelativeRetentionTime() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR); - case PeakScanListLabelProvider.RETENTION_INDEX: - if(PreferenceSupplier.showRetentionIndexWithoutDecimals()) { - return integerFormat.format(peakModel.getPeakMaximum().getRetentionIndex()); - } else { - return decimalFormat.format(peakModel.getPeakMaximum().getRetentionIndex()); - } - case PeakScanListLabelProvider.AREA_TOTAL: - if(PreferenceSupplier.showAreaWithoutDecimals()) { - return integerFormat.format(peak.getIntegratedArea()); - } else { - return decimalFormat.format(peak.getIntegratedArea()); - } - case PeakScanListLabelProvider.START_RETENTION_TIME: - return decimalFormat.format(peakModel.getStartRetentionTime() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR); - case PeakScanListLabelProvider.STOP_RETENTION_TIME: - return decimalFormat.format(peakModel.getStopRetentionTime() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR); - case PeakScanListLabelProvider.BEST_TARGET: - return TargetSupport.getBestTargetLibraryField(peak); + if(column.equals(PeakScanListLabelProvider.ACTIVE_FOR_ANALYSIS)) { + return peak.isActiveForAnalysis(); + } + if(column.equals(PeakScanListLabelProvider.RETENTION_TIME)) { + return decimalFormat.format(peakModel.getRetentionTimeAtPeakMaximum() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR); + } + if(column.equals(PeakScanListLabelProvider.RELATIVE_RETENTION_TIME)) { + return decimalFormat.format(peakModel.getPeakMaximum().getRelativeRetentionTime() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR); + } + if(column.equals(PeakScanListLabelProvider.RETENTION_INDEX)) { + if(PreferenceSupplier.showRetentionIndexWithoutDecimals()) { + return integerFormat.format(peakModel.getPeakMaximum().getRetentionIndex()); + } + return decimalFormat.format(peakModel.getPeakMaximum().getRetentionIndex()); + } + if(column.equals(PeakScanListLabelProvider.AREA_TOTAL)) { + if(PreferenceSupplier.showAreaWithoutDecimals()) { + return integerFormat.format(peak.getIntegratedArea()); + } + return decimalFormat.format(peak.getIntegratedArea()); + } + if(column.equals(PeakScanListLabelProvider.START_RETENTION_TIME)) { + return decimalFormat.format(peakModel.getStartRetentionTime() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR); + } + if(column.equals(PeakScanListLabelProvider.STOP_RETENTION_TIME)) { + return decimalFormat.format(peakModel.getStopRetentionTime() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR); + } + if(column.equals(PeakScanListLabelProvider.BEST_TARGET)) { + return TargetSupport.getBestTargetLibraryField(peak); } } return false; @@ -102,10 +105,8 @@ protected Object getValue(Object element) { protected void setValue(Object element, Object value) { if(element instanceof IPeak peak) { - switch(column) { - case PeakScanListLabelProvider.ACTIVE_FOR_ANALYSIS: - peak.setActiveForAnalysis((boolean)value); - break; + if(column.equals(PeakScanListLabelProvider.ACTIVE_FOR_ANALYSIS)) { + peak.setActiveForAnalysis((boolean)value); } tableViewer.refresh(element); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakScanListFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakScanListFilter.java index 8231cdb5a0..4554ceda39 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakScanListFilter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakScanListFilter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2021 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -42,11 +42,10 @@ public boolean select(Viewer viewer, Object parentElement, Object element) { } // if(element instanceof IPeak || element instanceof IScan) { - if(element instanceof IPeak) { - IPeak peak = (IPeak)element; + if(element instanceof IPeak peak) { return matchPeak(peak); - } else if(element instanceof IScan) { - IScan scan = (IScan)element; + } + if(element instanceof IScan scan) { return matchScan(scan); } } @@ -58,13 +57,12 @@ private boolean matchPeak(IPeak peak) { if(isMatch(peak, searchText, caseSensitive)) { return true; - } else { - for(ITarget target : peak.getTargets()) { - if(target instanceof IIdentificationTarget) { - IIdentificationTarget identificationTarget = (IIdentificationTarget)target; - if(libraryInformationSupport.containsSearchText(identificationTarget.getLibraryInformation(), searchText, caseSensitive)) { - return true; - } + } + for(ITarget target : peak.getTargets()) { + if(target instanceof IIdentificationTarget) { + IIdentificationTarget identificationTarget = (IIdentificationTarget)target; + if(libraryInformationSupport.containsSearchText(identificationTarget.getLibraryInformation(), searchText, caseSensitive)) { + return true; } } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakScanListLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakScanListLabelProvider.java index 2badcd1837..29e137e6c5 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakScanListLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakScanListLabelProvider.java @@ -32,39 +32,42 @@ import org.eclipse.chemclipse.support.text.ValueFormat; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; import org.eclipse.chemclipse.support.ui.workbench.DisplayUtils; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.chemclipse.wsd.model.core.IChromatogramPeakWSD; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Image; public class PeakScanListLabelProvider extends AbstractChemClipseLabelProvider { - public static final String BEST_TARGET = "Best Target"; - public static final String ACTIVE_FOR_ANALYSIS = "Active for Analysis"; - public static final String TYPE = "Type"; - public static final String RETENTION_TIME = "RT [min]"; - public static final String RELATIVE_RETENTION_TIME = "RRT [min]"; - public static final String RETENTION_INDEX = "RI"; - public static final String AREA_TOTAL = "Area"; - public static final String START_RETENTION_TIME = "Start RT [min]"; - public static final String STOP_RETENTION_TIME = "Stop RT [min]"; - public static final String WIDTH = "Width [min]"; - public static final String SCAN_NUMBER_AT_PEAK_MAX = "Scan# at Peak Maximum"; - public static final String SIGNAL_TO_NOISE = "S/N"; - public static final String LEADING = "Leading"; - public static final String TAILING = "Tailing"; - public static final String MODEL_DESCRIPTION = "Model Description"; - public static final String DETECTOR = "Detector"; - public static final String INTEGRATOR = "Integrator"; - public static final String SUGGESTED_COMPONENTS = "Suggested Components"; - public static final String AREA_PERCENT = "Area [%]"; - public static final String QUANTIFIER = "Quantifier"; - public static final String CLASSIFIER = "Classifier"; + public static final String BEST_TARGET = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.BEST_TARGET); + public static final String ACTIVE_FOR_ANALYSIS = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.ACTIVE_FOR_ANALYSIS); + public static final String TYPE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TYPE); + public static final String RETENTION_TIME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RT_MIN); + public static final String RELATIVE_RETENTION_TIME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RRT_MIN); + public static final String RETENTION_INDEX = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RI); + public static final String AREA_TOTAL = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.AREA_TOTAL); + public static final String START_RETENTION_TIME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.START_RETENTION_TIME); + public static final String STOP_RETENTION_TIME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.STOP_RETENTION_TIME); + public static final String WIDTH = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.WIDTH); + public static final String SCAN_NUMBER_AT_PEAK_MAX = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SCAN_NUMBER_AT_PEAK_MAX); + public static final String SIGNAL_TO_NOISE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SIGNAL_TO_NOISE); + public static final String LEADING = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.LEADING); + public static final String TAILING = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TAILING); + public static final String MODEL_DESCRIPTION = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.MODEL_DESCRIPTION); + public static final String DETECTOR = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.MODEL_DESCRIPTION); + public static final String INTEGRATOR = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.INTEGRATOR); + public static final String SUGGESTED_COMPONENTS = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SUGGESTED_COMPONENTS); + public static final String AREA_PERCENT = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.AREA_PERCENT); + public static final String QUANTIFIER = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.QUANTIFIER); + public static final String CLASSIFIER = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CLASSIFIER); // public static final String PEAK = "PEAK"; public static final String SCAN = "SCAN"; // private static final String BLANK = ""; private static final String NO_VALUE = "--"; + private static final String ISTD = "ISTD"; // private double chromatogramPeakArea = 0.0d; // @@ -281,7 +284,7 @@ private String getPeakText(IPeak peak, int columnIndex) { } break; case 19: - text = (!peak.getInternalStandards().isEmpty()) ? "ISTD" : BLANK; + text = (!peak.getInternalStandards().isEmpty()) ? ISTD : BLANK; break; case 20: { text = PeakScanListSupport.getClassifier(peak); @@ -357,6 +360,6 @@ private String getScanText(IScan scan, int columnIndex) { @Override public Image getImage(Object element) { - return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_PEAK, IApplicationImage.SIZE_16x16); + return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_PEAK, IApplicationImageProvider.SIZE_16x16); } -} \ No newline at end of file +} diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakScanListTableComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakScanListTableComparator.java index 5053f227a5..9d4270ab6e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakScanListTableComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakScanListTableComparator.java @@ -150,9 +150,8 @@ private int getSortOrder(Object object1, Object object2) { double peakAreaPercent1 = factor * getIntegratedArea(object1); double peakAreaPercent2 = factor * getIntegratedArea(object2); return Double.compare(peakAreaPercent2, peakAreaPercent1); - } else { - sortOrder = 0; } + sortOrder = 0; break; case 19: sortOrder = Integer.compare(getInternalStandards(object2), getInternalStandards(object1)); @@ -171,18 +170,16 @@ private boolean isActiveForAnalysis(Object object) { if(object instanceof IPeak peak) { return peak.isActiveForAnalysis(); - } else { - return false; } + return false; } private String getType(Object object) { if(object instanceof IPeak) { return PeakScanListLabelProvider.PEAK; - } else { - return PeakScanListLabelProvider.SCAN; } + return PeakScanListLabelProvider.SCAN; } private int getRetentionTime(Object object) { @@ -219,98 +216,87 @@ private double getIntegratedArea(Object object) { if(object instanceof IPeak peak) { return peak.getIntegratedArea(); - } else { - return 0.0d; } + return 0.0d; } private int getStartRetentionTime(Object object) { if(object instanceof IPeak peak) { return peak.getPeakModel().getStartRetentionTime(); - } else { - return 0; } + return 0; } private int getStopRetentionTime(Object object) { if(object instanceof IPeak peak) { return peak.getPeakModel().getStopRetentionTime(); - } else { - return 0; } + return 0; } private int getWidth(Object object) { if(object instanceof IPeak peak) { return peak.getPeakModel().getWidthBaselineByInflectionPoints(); - } else { - return 0; } + return 0; } private float getLeading(Object object) { if(object instanceof IPeak peak) { return peak.getPeakModel().getLeading(); - } else { - return 0; } + return 0; } private float getTailing(Object object) { if(object instanceof IPeak peak) { return peak.getPeakModel().getTailing(); - } else { - return 0; } + return 0; } private String getModelDescription(Object object) { if(object instanceof IPeak peak) { return peak.getModelDescription(); - } else { - return ""; } + return ""; } private String getDetectorDescription(Object object) { if(object instanceof IPeak peak) { return peak.getDetectorDescription(); - } else { - return ""; } + return ""; } private String getIntegratorDescription(Object object) { if(object instanceof IPeak peak) { return peak.getIntegratorDescription(); - } else { - return ""; } + return ""; } private int getSuggestedNumberOfComponents(Object object) { if(object instanceof IPeak peak) { return peak.getSuggestedNumberOfComponents(); - } else { - return 0; } + return 0; } private int getInternalStandards(Object object) { if(object instanceof IPeak peak) { return peak.getInternalStandards().size(); - } else { - return 0; } + return 0; } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakTableTargetComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakTableTargetComparator.java index f64e81a463..87f4e0c3ba 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakTableTargetComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakTableTargetComparator.java @@ -44,12 +44,12 @@ public int compare(Viewer viewer, Object e1, Object e2) { // List peakTargets1 = new ArrayList<>(); if(peak1 instanceof ITargetSupplier) { - ITargetSupplier targetSupplier = (ITargetSupplier)peak1; + ITargetSupplier targetSupplier = peak1; peakTargets1.addAll(targetSupplier.getTargets()); } // String peakTarget1 = ""; - if(peakTargets1 != null && peakTargets1.size() > 0) { + if(peakTargets1 != null && !peakTargets1.isEmpty()) { float retentionIndex = peakMaximum1.getRetentionIndex(); IdentificationTargetComparator identificationTargetComparator = new IdentificationTargetComparator(SortOrder.DESC, retentionIndex); Collections.sort(peakTargets1, identificationTargetComparator); @@ -64,12 +64,12 @@ public int compare(Viewer viewer, Object e1, Object e2) { // List peakTargets2 = new ArrayList<>(); if(peak2 instanceof ITargetSupplier) { - ITargetSupplier targetSupplier = (ITargetSupplier)peak2; + ITargetSupplier targetSupplier = peak2; peakTargets2.addAll(targetSupplier.getTargets()); } // String peakTarget2 = ""; - if(peakTargets2 != null && peakTargets2.size() > 0) { + if(peakTargets2 != null && !peakTargets2.isEmpty()) { float retentionIndex = peakMaximum2.getRetentionIndex(); IdentificationTargetComparator identificationTargetComparator = new IdentificationTargetComparator(SortOrder.DESC, retentionIndex); Collections.sort(peakTargets2, identificationTargetComparator); @@ -84,10 +84,10 @@ public int compare(Viewer viewer, Object e1, Object e2) { sortOrder = peakTarget2.compareTo(peakTarget1); break; case 2: - if(peak1 instanceof IChromatogramPeakMSD && peak2 instanceof IChromatogramPeakMSD) { - sortOrder = Float.compare(((IChromatogramPeakMSD)peak2).getSignalToNoiseRatio(), ((IChromatogramPeakMSD)peak1).getSignalToNoiseRatio()); - } else if(peak1 instanceof IChromatogramPeakCSD && peak2 instanceof IChromatogramPeakCSD) { - sortOrder = Float.compare(((IChromatogramPeakCSD)peak2).getSignalToNoiseRatio(), ((IChromatogramPeakCSD)peak1).getSignalToNoiseRatio()); + if(peak1 instanceof IChromatogramPeakMSD chromatogramPeakMSD1 && peak2 instanceof IChromatogramPeakMSD chromatogramPeakMSD2) { + sortOrder = Float.compare(chromatogramPeakMSD2.getSignalToNoiseRatio(), chromatogramPeakMSD1.getSignalToNoiseRatio()); + } else if(peak1 instanceof IChromatogramPeakCSD chromatogramPeakCSD1 && peak2 instanceof IChromatogramPeakCSD chromatogramPeakCSD2) { + sortOrder = Float.compare(chromatogramPeakCSD2.getSignalToNoiseRatio(), chromatogramPeakCSD1.getSignalToNoiseRatio()); } break; case 3: diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakTargetsLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakTargetsLabelProvider.java index fab040cd9f..39fe0b105b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakTargetsLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/PeakTargetsLabelProvider.java @@ -28,6 +28,7 @@ public class PeakTargetsLabelProvider extends LabelProvider implements ITableLab private DecimalFormat decimalFormat; public PeakTargetsLabelProvider() { + decimalFormat = ValueFormat.getDecimalFormatEnglish("0.000"); } @@ -43,7 +44,8 @@ public Image getColumnImage(Object element, int columnIndex) { float rating = identificationTarget.getComparisonResult().getRating(); if(rating >= IComparisonResult.RATING_LIMIT_UP) { return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_ARROW_UP, IApplicationImage.SIZE_16x16); - } else if(rating >= IComparisonResult.RATING_LIMIT_EQUAL) { + } + if(rating >= IComparisonResult.RATING_LIMIT_EQUAL) { return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_ARROW_EQUAL, IApplicationImage.SIZE_16x16); } else { return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_ARROW_DOWN, IApplicationImage.SIZE_16x16); @@ -57,8 +59,7 @@ public Image getColumnImage(Object element, int columnIndex) { public String getColumnText(Object element, int columnIndex) { String text = ""; - if(element instanceof IIdentificationTarget) { - IIdentificationTarget identificationEntry = (IIdentificationTarget)element; + if(element instanceof IIdentificationTarget identificationEntry) { ILibraryInformation libraryInformation = identificationEntry.getLibraryInformation(); IComparisonResult comparisonResult = identificationEntry.getComparisonResult(); switch(columnIndex) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantCompoundEditingSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantCompoundEditingSupport.java index 3da2923644..818ee1bd97 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantCompoundEditingSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantCompoundEditingSupport.java @@ -34,6 +34,7 @@ public class QuantCompoundEditingSupport extends EditingSupport { }; public QuantCompoundEditingSupport(QuantCompoundListUI tableViewer, String column) { + super(tableViewer); this.column = column; this.tableViewer = tableViewer; @@ -57,37 +58,47 @@ protected Object getValue(Object element) { if(element instanceof IQuantitationCompound) { IQuantitationCompound compound = (IQuantitationCompound)element; - switch(column) { - case QuantCompoundLabelProvider.NAME: - return compound.getName(); - case QuantCompoundLabelProvider.CHEMICAL_CLASS: - return compound.getChemicalClass(); - case QuantCompoundLabelProvider.CONCENTRATION_UNIT: - return compound.getConcentrationUnit(); - case QuantCompoundLabelProvider.CALIBRATION_METHOD: - String item = compound.getCalibrationMethod().toString(); - for(int i = 0; i < calibrationMethods.length; i++) { - if(calibrationMethods[i].equals(item)) { - return i; - } + if(column.equals(QuantCompoundLabelProvider.NAME)) { + return compound.getName(); + } + if(column.equals(QuantCompoundLabelProvider.CHEMICAL_CLASS)) { + return compound.getChemicalClass(); + } + if(column.equals(QuantCompoundLabelProvider.CONCENTRATION_UNIT)) { + return compound.getConcentrationUnit(); + } + if(column.equals(QuantCompoundLabelProvider.CALIBRATION_METHOD)) { + String item = compound.getCalibrationMethod().toString(); + for(int i = 0; i < calibrationMethods.length; i++) { + if(calibrationMethods[i].equals(item)) { + return i; } - return 0; - case QuantCompoundLabelProvider.CROSS_ZERO: - return compound.isCrossZero(); - case QuantCompoundLabelProvider.USE_TIC: - return compound.isUseTIC(); - case QuantCompoundLabelProvider.RETENTION_TIME: - return Double.toString(compound.getRetentionTimeWindow().getRetentionTime() / AbstractChromatogram.MINUTE_CORRELATION_FACTOR); - case QuantCompoundLabelProvider.RETENTION_TIME_LOWER: - return Double.toString(compound.getRetentionTimeWindow().getAllowedNegativeDeviation() / AbstractChromatogram.MINUTE_CORRELATION_FACTOR); - case QuantCompoundLabelProvider.RETENTION_TIME_UPPER: - return Double.toString(compound.getRetentionTimeWindow().getAllowedPositiveDeviation() / AbstractChromatogram.MINUTE_CORRELATION_FACTOR); - case QuantCompoundLabelProvider.RETENTION_INDEX: - return Float.toString(compound.getRetentionIndexWindow().getRetentionIndex()); - case QuantCompoundLabelProvider.RETENTION_INDEX_LOWER: - return Float.toString(compound.getRetentionIndexWindow().getAllowedNegativeDeviation()); - case QuantCompoundLabelProvider.RETENTION_INDEX_UPPER: - return Float.toString(compound.getRetentionIndexWindow().getAllowedPositiveDeviation()); + } + return 0; + } + if(column.equals(QuantCompoundLabelProvider.CROSS_ZERO)) { + return compound.isCrossZero(); + } + if(column.equals(QuantCompoundLabelProvider.USE_TIC)) { + return compound.isUseTIC(); + } + if(column.equals(QuantCompoundLabelProvider.RETENTION_TIME)) { + return Double.toString(compound.getRetentionTimeWindow().getRetentionTime() / AbstractChromatogram.MINUTE_CORRELATION_FACTOR); + } + if(column.equals(QuantCompoundLabelProvider.RETENTION_TIME_LOWER)) { + return Double.toString(compound.getRetentionTimeWindow().getAllowedNegativeDeviation() / AbstractChromatogram.MINUTE_CORRELATION_FACTOR); + } + if(column.equals(QuantCompoundLabelProvider.RETENTION_TIME_UPPER)) { + return Double.toString(compound.getRetentionTimeWindow().getAllowedPositiveDeviation() / AbstractChromatogram.MINUTE_CORRELATION_FACTOR); + } + if(column.equals(QuantCompoundLabelProvider.RETENTION_INDEX)) { + return Float.toString(compound.getRetentionIndexWindow().getRetentionIndex()); + } + if(column.equals(QuantCompoundLabelProvider.RETENTION_INDEX_LOWER)) { + return Float.toString(compound.getRetentionIndexWindow().getAllowedNegativeDeviation()); + } + if(column.equals(QuantCompoundLabelProvider.RETENTION_INDEX_UPPER)) { + return Float.toString(compound.getRetentionIndexWindow().getAllowedPositiveDeviation()); } } return false; @@ -98,68 +109,66 @@ protected void setValue(Object element, Object value) { if(element instanceof IQuantitationCompound) { IQuantitationCompound compound = (IQuantitationCompound)element; - switch(column) { - case QuantCompoundLabelProvider.NAME: - String name = (String)value; - if(!tableViewer.containsName(name)) { - compound.setName(name); - } - break; - case QuantCompoundLabelProvider.CHEMICAL_CLASS: - compound.setChemicalClass((String)value); - break; - case QuantCompoundLabelProvider.CONCENTRATION_UNIT: - compound.setConcentrationUnit((String)value); - break; - case QuantCompoundLabelProvider.CALIBRATION_METHOD: - String calibrationMethod = calibrationMethods[(int)value]; - compound.setCalibrationMethod(CalibrationMethod.valueOf(calibrationMethod)); - break; - case QuantCompoundLabelProvider.CROSS_ZERO: - compound.setUseCrossZero((boolean)value); - break; - case QuantCompoundLabelProvider.USE_TIC: - compound.setUseTIC((boolean)value); - break; - case QuantCompoundLabelProvider.RETENTION_TIME: - double retentionTime = getValue(value, 0.0d); - if(retentionTime >= 0) { - compound.getRetentionTimeWindow().setRetentionTime((int)(retentionTime * AbstractChromatogram.MINUTE_CORRELATION_FACTOR)); - } - break; - case QuantCompoundLabelProvider.RETENTION_TIME_LOWER: - double allowedNegativeDeviationRT = getValue(value, 0.0d); - if(allowedNegativeDeviationRT >= 0) { - compound.getRetentionTimeWindow().setAllowedNegativeDeviation((int)(allowedNegativeDeviationRT * AbstractChromatogram.MINUTE_CORRELATION_FACTOR)); - } - break; - case QuantCompoundLabelProvider.RETENTION_TIME_UPPER: - double allowedPositiveDeviationRT = getValue(value, 0.0d); - if(allowedPositiveDeviationRT >= 0) { - compound.getRetentionTimeWindow().setAllowedPositiveDeviation((int)(allowedPositiveDeviationRT * AbstractChromatogram.MINUTE_CORRELATION_FACTOR)); - } - break; - case QuantCompoundLabelProvider.RETENTION_INDEX: - float retentionIndex = getValue(value, 0.0f); - if(retentionIndex >= 0) { - compound.getRetentionIndexWindow().setRetentionIndex(retentionIndex); - } - break; - case QuantCompoundLabelProvider.RETENTION_INDEX_LOWER: - float allowedNegativeDeviationRI = getValue(value, 0.0f); - if(allowedNegativeDeviationRI >= 0) { - compound.getRetentionIndexWindow().setAllowedNegativeDeviation(allowedNegativeDeviationRI); - } - break; - case QuantCompoundLabelProvider.RETENTION_INDEX_UPPER: - float allowedPositiveDeviationRI = getValue(value, 0.0f); - if(allowedPositiveDeviationRI >= 0) { - compound.getRetentionIndexWindow().setAllowedPositiveDeviation(allowedPositiveDeviationRI); - } - break; + if(column.equals(QuantCompoundLabelProvider.NAME)) { + String name = (String)value; + if(!tableViewer.containsName(name)) { + compound.setName(name); + } + } + if(column.equals(QuantCompoundLabelProvider.CHEMICAL_CLASS)) { + compound.setChemicalClass((String)value); + } + if(column.equals(QuantCompoundLabelProvider.CONCENTRATION_UNIT)) { + compound.setConcentrationUnit((String)value); + } + if(column.equals(QuantCompoundLabelProvider.CALIBRATION_METHOD)) { + String calibrationMethod = calibrationMethods[(int)value]; + compound.setCalibrationMethod(CalibrationMethod.valueOf(calibrationMethod)); + } + if(column.equals(QuantCompoundLabelProvider.CROSS_ZERO)) { + compound.setUseCrossZero((boolean)value); + } + if(column.equals(QuantCompoundLabelProvider.USE_TIC)) { + compound.setUseTIC((boolean)value); + } + if(column.equals(QuantCompoundLabelProvider.RETENTION_TIME)) { + double retentionTime = getValue(value, 0.0d); + if(retentionTime >= 0) { + compound.getRetentionTimeWindow().setRetentionTime((int)(retentionTime * AbstractChromatogram.MINUTE_CORRELATION_FACTOR)); + } + } + if(column.equals(QuantCompoundLabelProvider.RETENTION_TIME_LOWER)) { + double allowedNegativeDeviationRT = getValue(value, 0.0d); + if(allowedNegativeDeviationRT >= 0) { + compound.getRetentionTimeWindow().setAllowedNegativeDeviation((int)(allowedNegativeDeviationRT * AbstractChromatogram.MINUTE_CORRELATION_FACTOR)); + } + } + if(column.equals(QuantCompoundLabelProvider.RETENTION_TIME_UPPER)) { + double allowedPositiveDeviationRT = getValue(value, 0.0d); + if(allowedPositiveDeviationRT >= 0) { + compound.getRetentionTimeWindow().setAllowedPositiveDeviation((int)(allowedPositiveDeviationRT * AbstractChromatogram.MINUTE_CORRELATION_FACTOR)); + } + } + if(column.equals(QuantCompoundLabelProvider.RETENTION_INDEX)) { + float retentionIndex = getValue(value, 0.0f); + if(retentionIndex >= 0) { + compound.getRetentionIndexWindow().setRetentionIndex(retentionIndex); + } + } + if(column.equals(QuantCompoundLabelProvider.RETENTION_INDEX_LOWER)) { + float allowedNegativeDeviationRI = getValue(value, 0.0f); + if(allowedNegativeDeviationRI >= 0) { + compound.getRetentionIndexWindow().setAllowedNegativeDeviation(allowedNegativeDeviationRI); + } + } + if(column.equals(QuantCompoundLabelProvider.RETENTION_INDEX_UPPER)) { + float allowedPositiveDeviationRI = getValue(value, 0.0f); + if(allowedPositiveDeviationRI >= 0) { + compound.getRetentionIndexWindow().setAllowedPositiveDeviation(allowedPositiveDeviationRI); + } } - tableViewer.refresh(); } + tableViewer.refresh(); } private float getValue(Object value, float def) { @@ -190,23 +199,19 @@ private double getValue(Object value, double def) { private void setCellEditor(String column) { - switch(column) { - case QuantCompoundLabelProvider.CROSS_ZERO: - case QuantCompoundLabelProvider.USE_TIC: - this.cellEditor = new CheckboxCellEditor(tableViewer.getTable()); - break; - case QuantCompoundLabelProvider.CALIBRATION_METHOD: - this.cellEditor = new ComboBoxCellEditor(tableViewer.getTable(), // - new String[]{ // - CalibrationMethod.LINEAR.toString(), // - CalibrationMethod.QUADRATIC.toString(), // - CalibrationMethod.AVERAGE.toString() // - }, // - SWT.READ_ONLY); - break; - default: - this.cellEditor = new TextCellEditor(tableViewer.getTable()); - break; + if(column.equals(QuantCompoundLabelProvider.CROSS_ZERO) || column.equals(QuantCompoundLabelProvider.USE_TIC)) { + this.cellEditor = new CheckboxCellEditor(tableViewer.getTable()); + } + if(column.equals(QuantCompoundLabelProvider.CALIBRATION_METHOD)) { + this.cellEditor = new ComboBoxCellEditor(tableViewer.getTable(), // + new String[]{ // + CalibrationMethod.LINEAR.toString(), // + CalibrationMethod.QUADRATIC.toString(), // + CalibrationMethod.AVERAGE.toString() // + }, // + SWT.READ_ONLY); + } else { + this.cellEditor = new TextCellEditor(tableViewer.getTable()); } } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantCompoundLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantCompoundLabelProvider.java index a4e6db0093..9444a7374f 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantCompoundLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantCompoundLabelProvider.java @@ -20,22 +20,24 @@ import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.swt.graphics.Image; public class QuantCompoundLabelProvider extends AbstractChemClipseLabelProvider { - public static final String NAME = "Name"; - public static final String CHEMICAL_CLASS = "Chemical Class"; - public static final String CONCENTRATION_UNIT = "Concentration Unit"; - public static final String CALIBRATION_METHOD = "Calibration Method"; - public static final String CROSS_ZERO = "Cross Zero"; - public static final String USE_TIC = "Use TIC"; - public static final String RETENTION_TIME = "Retention Time (RT)"; - public static final String RETENTION_TIME_LOWER = "RT (-)"; - public static final String RETENTION_TIME_UPPER = "RT (+)"; - public static final String RETENTION_INDEX = "Retention Index (RI)"; - public static final String RETENTION_INDEX_LOWER = "RI (-)"; - public static final String RETENTION_INDEX_UPPER = "RI (+)"; + public static final String NAME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NAME); + public static final String CHEMICAL_CLASS = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CHEMICAL_CLASS); + public static final String CONCENTRATION_UNIT = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CONCENTRATION_UNIT); + public static final String CALIBRATION_METHOD = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CALIBRATION_METHOD); + public static final String CROSS_ZERO = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CROSS_ZERO); + public static final String USE_TIC = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.USE_TIC); + public static final String RETENTION_TIME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RETENTION_TIME); + public static final String RETENTION_TIME_LOWER = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RETENTION_TIME_LOWER); + public static final String RETENTION_TIME_UPPER = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RETENTION_TIME_UPPER); + public static final String RETENTION_INDEX = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RETENTION_INDEX); + public static final String RETENTION_INDEX_LOWER = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RETENTION_INDEX_LOWER); + public static final String RETENTION_INDEX_UPPER = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RETENTION_INDEX_UPPER); // public static final String[] TITLES = {// NAME, // @@ -72,7 +74,8 @@ public Image getColumnImage(Object element, int columnIndex) { if(columnIndex == 0) { return getImage(element); - } else if(columnIndex == 4) { + } + if(columnIndex == 4) { if(element instanceof IQuantitationCompound) { IQuantitationCompound quantitationCompound = (IQuantitationCompound)element; String fileName = (quantitationCompound.isCrossZero()) ? IApplicationImage.IMAGE_SELECTED : IApplicationImage.IMAGE_DESELECTED; @@ -143,6 +146,7 @@ public String getColumnText(Object element, int columnIndex) { return text; } + @Override public Image getImage(Object element) { return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_QUANTIFY_SELECTED_PEAK, IApplicationImage.SIZE_16x16); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantCompoundTableComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantCompoundTableComparator.java index 88832ced50..d114e3355f 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantCompoundTableComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantCompoundTableComparator.java @@ -24,12 +24,10 @@ public class QuantCompoundTableComparator extends AbstractRecordTableComparator public int compare(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof IQuantitationCompound && e2 instanceof IQuantitationCompound) { - IQuantitationCompound compound1 = (IQuantitationCompound)e1; + if(e1 instanceof IQuantitationCompound compound1 && e2 instanceof IQuantitationCompound compound2) { IRetentionTimeWindow retentionTimeWindow1 = compound1.getRetentionTimeWindow(); IRetentionIndexWindow retentionIndexWindow1 = compound1.getRetentionIndexWindow(); // - IQuantitationCompound compound2 = (IQuantitationCompound)e2; IRetentionTimeWindow retentionTimeWindow2 = compound2.getRetentionTimeWindow(); IRetentionIndexWindow retentionIndexWindow2 = compound2.getRetentionIndexWindow(); // diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantPeaksEditingSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantPeaksEditingSupport.java index 655bd1aaf6..3d09a9a8ec 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantPeaksEditingSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantPeaksEditingSupport.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 Lablicate GmbH. + * Copyright (c) 2019, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -27,6 +27,7 @@ public class QuantPeaksEditingSupport extends EditingSupport { private String column; public QuantPeaksEditingSupport(ExtendedTableViewer tableViewer, String column) { + super(tableViewer); this.column = column; this.cellEditor = new TextCellEditor(tableViewer.getTable()); @@ -48,13 +49,12 @@ protected boolean canEdit(Object element) { @Override protected Object getValue(Object element) { - if(element instanceof IQuantitationPeak) { - IQuantitationPeak peak = (IQuantitationPeak)element; - switch(column) { - case QuantPeaksLabelProvider.CONCENTRATION: - return Double.toString(peak.getConcentration()); - case QuantPeaksLabelProvider.CONCENTRATION_UNIT: - return peak.getConcentrationUnit(); + if(element instanceof IQuantitationPeak peak) { + if(column.equals(QuantPeaksLabelProvider.CONCENTRATION)) { + return Double.toString(peak.getConcentration()); + } + if(column.equals(QuantPeaksLabelProvider.CONCENTRATION_UNIT)) { + return peak.getConcentrationUnit(); } } return false; @@ -63,21 +63,18 @@ protected Object getValue(Object element) { @Override protected void setValue(Object element, Object value) { - if(element instanceof IQuantitationPeak) { - IQuantitationPeak peak = (IQuantitationPeak)element; - switch(column) { - case QuantPeaksLabelProvider.CONCENTRATION: - double concentration = parseConcentration((String)value); - if(!Double.isNaN(concentration)) { - peak.setConcentration(concentration); - } - break; - case QuantPeaksLabelProvider.CONCENTRATION_UNIT: - peak.setConcentrationUnit((String)value); - break; + if(element instanceof IQuantitationPeak peak) { + if(column.equals(QuantPeaksLabelProvider.CONCENTRATION)) { + double concentration = parseConcentration((String)value); + if(!Double.isNaN(concentration)) { + peak.setConcentration(concentration); + } + } + if(column.equals(QuantPeaksLabelProvider.CONCENTRATION_UNIT)) { + peak.setConcentrationUnit((String)value); } - tableViewer.refresh(); } + tableViewer.refresh(); } private double parseConcentration(String value) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantPeaksLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantPeaksLabelProvider.java index 068ae961da..4f26631598 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantPeaksLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantPeaksLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013, 2018 Lablicate GmbH. + * Copyright (c) 2013, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -17,13 +17,15 @@ import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.support.charts.PeakDataSupport; import org.eclipse.swt.graphics.Image; public class QuantPeaksLabelProvider extends AbstractChemClipseLabelProvider { - public static final String CONCENTRATION = "Concentration"; - public static final String CONCENTRATION_UNIT = "Unit"; + public static final String CONCENTRATION = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CONCENTRATION); + public static final String CONCENTRATION_UNIT = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.UNIT); // private PeakDataSupport peakDataSupport = new PeakDataSupport(); // @@ -44,9 +46,8 @@ public Image getColumnImage(Object element, int columnIndex) { if(columnIndex == 0) { return getImage(element); - } else { - return null; } + return null; } @Override @@ -54,8 +55,7 @@ public String getColumnText(Object element, int columnIndex) { DecimalFormat decimalFormat = getDecimalFormat(); String text = ""; - if(element instanceof IQuantitationPeak) { - IQuantitationPeak entry = (IQuantitationPeak)element; + if(element instanceof IQuantitationPeak entry) { switch(columnIndex) { case 0: text = decimalFormat.format(entry.getConcentration()); @@ -73,6 +73,7 @@ public String getColumnText(Object element, int columnIndex) { return text; } + @Override public Image getImage(Object element) { return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_QUANTIFY_SELECTED_PEAK, IApplicationImage.SIZE_16x16); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantPeaksTableComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantPeaksTableComparator.java index db3f940f3c..1d677e4c78 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantPeaksTableComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantPeaksTableComparator.java @@ -25,9 +25,7 @@ public class QuantPeaksTableComparator extends AbstractRecordTableComparator imp public int compare(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof IQuantitationPeak && e2 instanceof IQuantitationPeak) { - IQuantitationPeak entry1 = (IQuantitationPeak)e1; - IQuantitationPeak entry2 = (IQuantitationPeak)e2; + if(e1 instanceof IQuantitationPeak entry1 && e2 instanceof IQuantitationPeak entry2) { // switch(getPropertyIndex()) { case 0: diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantReferencesComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantReferencesComparator.java index b928c284a8..8e36ca03cc 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantReferencesComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantReferencesComparator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -21,11 +21,11 @@ public class QuantReferencesComparator extends AbstractRecordTableComparator imp public int compare(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof String && e2 instanceof String) { + if(e1 instanceof String s1 && e2 instanceof String s2) { // switch(getPropertyIndex()) { case 0: - sortOrder = ((String)e2).compareTo((String)e1); + sortOrder = s2.compareTo(s1); break; default: sortOrder = 0; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantReferencesEditingSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantReferencesEditingSupport.java index 4a83ff02fb..aba8fc8fec 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantReferencesEditingSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantReferencesEditingSupport.java @@ -23,6 +23,7 @@ public class QuantReferencesEditingSupport extends EditingSupport { private String column; public QuantReferencesEditingSupport(ExtendedTableViewer tableViewer, String column) { + super(tableViewer); this.column = column; this.cellEditor = new TextCellEditor(tableViewer.getTable()); @@ -48,9 +49,8 @@ protected boolean canEdit(Object element) { protected Object getValue(Object element) { if(element instanceof String) { - switch(column) { - case QuantReferencesLabelProvider.NAME: - return (String)element; + if(column.equals(QuantReferencesLabelProvider.NAME)) { + return element; } } return false; @@ -60,10 +60,8 @@ protected Object getValue(Object element) { protected void setValue(Object element, Object value) { if(element instanceof String) { - switch(column) { - case QuantReferencesLabelProvider.NAME: - element = (String)value; - break; + if(column.equals(QuantReferencesLabelProvider.NAME)) { + element = value; } tableViewer.refresh(); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantReferencesFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantReferencesFilter.java index db9a7330b0..ecbb2f009b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantReferencesFilter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantReferencesFilter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -39,8 +39,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) { searchText = searchText.toLowerCase(); } // - if(element instanceof String) { - String value = (String)element; + if(element instanceof String value) { if(!caseSensitive) { value = value.toLowerCase(); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantReferencesLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantReferencesLabelProvider.java index b17af35606..c5eaaafd43 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantReferencesLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantReferencesLabelProvider.java @@ -14,11 +14,13 @@ import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.swt.graphics.Image; public class QuantReferencesLabelProvider extends AbstractChemClipseLabelProvider { - public static final String NAME = "Name"; + public static final String NAME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NAME); // public static final String[] TITLES = { // NAME // @@ -40,10 +42,10 @@ public Image getColumnImage(Object element, int columnIndex) { public String getColumnText(Object element, int columnIndex) { String text = ""; - if(element instanceof String) { + if(element instanceof String value) { switch(columnIndex) { case 0: - text = (String)element; + text = value; break; default: text = "n.v."; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantResponseEditingSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantResponseEditingSupport.java index 99b8b6731e..11bb73a323 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantResponseEditingSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantResponseEditingSupport.java @@ -24,6 +24,7 @@ public class QuantResponseEditingSupport extends EditingSupport { private String column; public QuantResponseEditingSupport(ExtendedTableViewer tableViewer, String column) { + super(tableViewer); this.column = column; this.cellEditor = new TextCellEditor(tableViewer.getTable()); @@ -45,11 +46,9 @@ protected boolean canEdit(Object element) { @Override protected Object getValue(Object element) { - if(element instanceof IResponseSignal) { - IResponseSignal signal = (IResponseSignal)element; - switch(column) { - case QuantResponseLabelProvider.RESPONSE: - return Double.toString(signal.getResponse()); + if(element instanceof IResponseSignal signal) { + if(column.equals(QuantResponseLabelProvider.RESPONSE)) { + return Double.toString(signal.getResponse()); } } return false; @@ -58,15 +57,12 @@ protected Object getValue(Object element) { @Override protected void setValue(Object element, Object value) { - if(element instanceof IResponseSignal) { - IResponseSignal signal = (IResponseSignal)element; - switch(column) { - case QuantResponseLabelProvider.RESPONSE: - double response = getValue(value, -1); - if(response >= 0) { - signal.setResponse(response); - } - break; + if(element instanceof IResponseSignal signal) { + if(column.equals(QuantResponseLabelProvider.RESPONSE)) { + double response = getValue(value, -1); + if(response >= 0) { + signal.setResponse(response); + } } tableViewer.refresh(); } @@ -75,9 +71,9 @@ protected void setValue(Object element, Object value) { private double getValue(Object value, double def) { double result = def; - if(value instanceof String) { + if(value instanceof String stringValue) { try { - result = Double.parseDouble((String)value); + result = Double.parseDouble(stringValue); } catch(NumberFormatException e) { // } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantResponseLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantResponseLabelProvider.java index 23bd64ff82..2f15176a3a 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantResponseLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantResponseLabelProvider.java @@ -18,13 +18,15 @@ import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.swt.graphics.Image; public class QuantResponseLabelProvider extends AbstractChemClipseLabelProvider { - public static final String SIGNAL = "Signal"; - public static final String CONCENTRATION = "Concentration"; - public static final String RESPONSE = "Response"; + public static final String SIGNAL = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SIGNAL); + public static final String CONCENTRATION = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CONCENTRATION); + public static final String RESPONSE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RESPONSE); // public static final String[] TITLES = { // SIGNAL, // @@ -43,9 +45,8 @@ public Image getColumnImage(Object element, int columnIndex) { if(columnIndex == 0) { return getImage(element); - } else { - return null; } + return null; } @Override @@ -53,8 +54,7 @@ public String getColumnText(Object element, int columnIndex) { DecimalFormat decimalFormat = getDecimalFormat(); String text = ""; - if(element instanceof IResponseSignal) { - IResponseSignal responseSignal = (IResponseSignal)element; + if(element instanceof IResponseSignal responseSignal) { // switch(columnIndex) { case 0: @@ -73,6 +73,7 @@ public String getColumnText(Object element, int columnIndex) { return text; } + @Override public Image getImage(Object element) { return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_QUANTIFY_SELECTED_PEAK, IApplicationImage.SIZE_16x16); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantResponseTableComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantResponseTableComparator.java index 32426575fd..e6f1199846 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantResponseTableComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantResponseTableComparator.java @@ -22,9 +22,7 @@ public class QuantResponseTableComparator extends AbstractRecordTableComparator public int compare(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof IResponseSignal && e2 instanceof IResponseSignal) { - IResponseSignal entry1 = (IResponseSignal)e1; - IResponseSignal entry2 = (IResponseSignal)e2; + if(e1 instanceof IResponseSignal entry1 && e2 instanceof IResponseSignal entry2) { // switch(getPropertyIndex()) { case 0: diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantSignalsEditingSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantSignalsEditingSupport.java index 5f9d3df04d..a0f4045000 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantSignalsEditingSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantSignalsEditingSupport.java @@ -25,6 +25,7 @@ public class QuantSignalsEditingSupport extends EditingSupport { private String column; public QuantSignalsEditingSupport(ExtendedTableViewer tableViewer, String column) { + super(tableViewer); this.column = column; if(column.equals(QuantSignalsLabelProvider.USE)) { @@ -50,15 +51,15 @@ protected boolean canEdit(Object element) { @Override protected Object getValue(Object element) { - if(element instanceof IQuantitationSignal) { - IQuantitationSignal signal = (IQuantitationSignal)element; - switch(column) { - case QuantSignalsLabelProvider.RELATIVE_RESPONSE: - return Double.toString(signal.getRelativeResponse()); - case QuantSignalsLabelProvider.UNCERTAINTY: - return Double.toString(signal.getUncertainty()); - case QuantSignalsLabelProvider.USE: - return signal.isUse(); + if(element instanceof IQuantitationSignal signal) { + if(column.equals(QuantSignalsLabelProvider.RELATIVE_RESPONSE)) { + return Double.toString(signal.getRelativeResponse()); + } + if(column.equals(QuantSignalsLabelProvider.UNCERTAINTY)) { + return Double.toString(signal.getUncertainty()); + } + if(column.equals(QuantSignalsLabelProvider.USE)) { + return signal.isUse(); } } return false; @@ -67,35 +68,32 @@ protected Object getValue(Object element) { @Override protected void setValue(Object element, Object value) { - if(element instanceof IQuantitationSignal) { - IQuantitationSignal signal = (IQuantitationSignal)element; - switch(column) { - case QuantSignalsLabelProvider.RELATIVE_RESPONSE: - double relativeResponse = getValue(value, -1.0f); - if(relativeResponse >= 0) { - signal.setRelativeResponse(relativeResponse); - } - break; - case QuantSignalsLabelProvider.UNCERTAINTY: - double uncertainty = getValue(value, -1.0d); - if(uncertainty >= 0) { - signal.setUncertainty(uncertainty); - } - break; - case QuantSignalsLabelProvider.USE: - signal.setUse((boolean)value); - break; + if(element instanceof IQuantitationSignal signal) { + if(column.equals(QuantSignalsLabelProvider.RELATIVE_RESPONSE)) { + double relativeResponse = getValue(value, -1.0f); + if(relativeResponse >= 0) { + signal.setRelativeResponse(relativeResponse); + } + } + if(column.equals(QuantSignalsLabelProvider.UNCERTAINTY)) { + double uncertainty = getValue(value, -1.0d); + if(uncertainty >= 0) { + signal.setUncertainty(uncertainty); + } + } + if(column.equals(QuantSignalsLabelProvider.USE)) { + signal.setUse((boolean)value); } - tableViewer.refresh(); } + tableViewer.refresh(); } private double getValue(Object value, double def) { double result = def; - if(value instanceof String) { + if(value instanceof String stringValue) { try { - result = Double.parseDouble((String)value); + result = Double.parseDouble(stringValue); } catch(NumberFormatException e) { // } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantSignalsLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantSignalsLabelProvider.java index da50c7e608..50b0aeb533 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantSignalsLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantSignalsLabelProvider.java @@ -17,15 +17,18 @@ import org.eclipse.chemclipse.model.quantitation.IQuantitationSignal; import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; +import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.swt.graphics.Image; public class QuantSignalsLabelProvider extends AbstractChemClipseLabelProvider { - public static final String SIGNAL = "Signal"; - public static final String RELATIVE_RESPONSE = "Relative Response"; - public static final String UNCERTAINTY = "Uncertainty"; - public static final String USE = "Use"; + public static final String SIGNAL = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SIGNAL); + public static final String RELATIVE_RESPONSE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RELATIVE_RESPONSE); + public static final String UNCERTAINTY = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.UNCERTAINTY); + public static final String USE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.USE); // public static final String[] TITLES = { // SIGNAL, // @@ -46,11 +49,11 @@ public Image getColumnImage(Object element, int columnIndex) { if(columnIndex == 0) { return getImage(element); - } else if(columnIndex == 3) { - if(element instanceof IQuantitationSignal) { - IQuantitationSignal signal = (IQuantitationSignal)element; + } + if(columnIndex == 3) { + if(element instanceof IQuantitationSignal signal) { String fileName = (signal.isUse()) ? IApplicationImage.IMAGE_SELECTED : IApplicationImage.IMAGE_DESELECTED; - return ApplicationImageFactory.getInstance().getImage(fileName, IApplicationImage.SIZE_16x16); + return ApplicationImageFactory.getInstance().getImage(fileName, IApplicationImageProvider.SIZE_16x16); } } // @@ -62,9 +65,7 @@ public String getColumnText(Object element, int columnIndex) { DecimalFormat decimalFormat = getDecimalFormat(); String text = ""; - if(element instanceof IQuantitationSignal) { - IQuantitationSignal quantitationSignal = (IQuantitationSignal)element; - // + if(element instanceof IQuantitationSignal quantitationSignal) { switch(columnIndex) { case 0: text = SignalSupport.asText(quantitationSignal.getSignal(), decimalFormat); @@ -85,6 +86,7 @@ public String getColumnText(Object element, int columnIndex) { return text; } + @Override public Image getImage(Object element) { return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_QUANTIFY_SELECTED_PEAK, IApplicationImage.SIZE_16x16); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantSignalsTableComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantSignalsTableComparator.java index b9619ecb55..abfa88d8cc 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantSignalsTableComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantSignalsTableComparator.java @@ -22,10 +22,7 @@ public class QuantSignalsTableComparator extends AbstractRecordTableComparator i public int compare(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof IQuantitationSignal && e2 instanceof IQuantitationSignal) { - IQuantitationSignal entry1 = (IQuantitationSignal)e1; - IQuantitationSignal entry2 = (IQuantitationSignal)e2; - // + if(e1 instanceof IQuantitationSignal entry1 && e2 instanceof IQuantitationSignal entry2) { switch(getPropertyIndex()) { case 0: sortOrder = Double.compare(entry2.getSignal(), entry1.getSignal()); @@ -37,7 +34,7 @@ public int compare(Viewer viewer, Object e1, Object e2) { sortOrder = Double.compare(entry2.getUncertainty(), entry1.getUncertainty()); break; case 3: - sortOrder = Boolean.valueOf(entry2.isUse()).compareTo(entry1.isUse()); + sortOrder = Boolean.compare(entry2.isUse(), entry1.isUse()); break; default: sortOrder = 0; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantitationListContentProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantitationListContentProvider.java index cbe5b06295..823846850d 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantitationListContentProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantitationListContentProvider.java @@ -23,13 +23,11 @@ public class QuantitationListContentProvider implements IStructuredContentProvid @Override public Object[] getElements(Object inputElement) { - if(inputElement instanceof IPeak) { - IPeak peak = (IPeak)inputElement; + if(inputElement instanceof IPeak peak) { List quantitationEntries = peak.getQuantitationEntries(); return quantitationEntries.toArray(); - } else { - return null; } + return null; } @Override diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantitationListLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantitationListLabelProvider.java index ca7ec0af76..8395f725d2 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantitationListLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantitationListLabelProvider.java @@ -18,21 +18,23 @@ import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.swt.graphics.Image; public class QuantitationListLabelProvider extends AbstractChemClipseLabelProvider { public static final String[] TITLES = { // - "Name", // - "Chemical Class", // - "Concentration", // - "Concentration Unit", // - "Area", // - "Trace", // - "Calibration Method", // - "Cross Zero", // - "Flag", // - "Description" // + ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NAME), // + ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CHEMICAL_CLASS), // + ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CONCENTRATION), // + ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CONCENTRATION_UNIT), // + ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.AREA), // + ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TRACE), // + ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CALIBRATION_METHOD), // + ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CROSS_ZERO), // + ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FLAG), // + ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.DESCRIPTION) // }; public static final int[] BOUNDS = { // 100, // @@ -52,9 +54,8 @@ public Image getColumnImage(Object element, int columnIndex) { if(columnIndex == 0) { return getImage(element); - } else { - return null; } + return null; } @Override @@ -62,8 +63,7 @@ public String getColumnText(Object element, int columnIndex) { DecimalFormat decimalFormat = getDecimalFormat(); String text = ""; - if(element instanceof IQuantitationEntry) { - IQuantitationEntry quantitationEntry = (IQuantitationEntry)element; + if(element instanceof IQuantitationEntry quantitationEntry) { switch(columnIndex) { case 0: text = quantitationEntry.getName(); @@ -102,6 +102,7 @@ public String getColumnText(Object element, int columnIndex) { return text; } + @Override public Image getImage(Object element) { return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_QUANTITATION_RESULTS, IApplicationImage.SIZE_16x16); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantitationListTableComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantitationListTableComparator.java index 7c8e63734d..25d80cff8a 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantitationListTableComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/QuantitationListTableComparator.java @@ -23,9 +23,7 @@ public class QuantitationListTableComparator extends AbstractRecordTableComparat public int compare(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof IQuantitationEntry && e2 instanceof IQuantitationEntry) { - IQuantitationEntry quantitationEntry1 = (IQuantitationEntry)e1; - IQuantitationEntry quantitationEntry2 = (IQuantitationEntry)e2; + if(e1 instanceof IQuantitationEntry quantitationEntry1 && e2 instanceof IQuantitationEntry quantitationEntry2) { switch(getPropertyIndex()) { case 0: sortOrder = quantitationEntry2.getName().compareTo(quantitationEntry1.getName()); @@ -49,7 +47,7 @@ public int compare(Viewer viewer, Object e1, Object e2) { sortOrder = quantitationEntry2.getCalibrationMethod().compareTo(quantitationEntry1.getCalibrationMethod()); break; case 7: - sortOrder = Boolean.valueOf(quantitationEntry2.getUsedCrossZero()).compareTo(quantitationEntry1.getUsedCrossZero()); + sortOrder = Boolean.compare(quantitationEntry2.getUsedCrossZero(), quantitationEntry1.getUsedCrossZero()); break; case 8: sortOrder = quantitationEntry2.getQuantitationFlag().compareTo(quantitationEntry1.getQuantitationFlag()); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/RetentionIndexEditingSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/RetentionIndexEditingSupport.java index 78260143a2..31ea4abba1 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/RetentionIndexEditingSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/RetentionIndexEditingSupport.java @@ -45,8 +45,7 @@ protected boolean canEdit(Object element) { protected Object getValue(Object element) { Object object = null; - if(element instanceof IRetentionIndexEntry) { - IRetentionIndexEntry retentionIndexEntry = (IRetentionIndexEntry)element; + if(element instanceof IRetentionIndexEntry retentionIndexEntry) { object = retentionIndexEntry.getName(); } return object; @@ -55,8 +54,7 @@ protected Object getValue(Object element) { @Override protected void setValue(Object element, Object value) { - if(element instanceof IRetentionIndexEntry) { - IRetentionIndexEntry retentionIndexEntry = (IRetentionIndexEntry)element; + if(element instanceof IRetentionIndexEntry retentionIndexEntry) { retentionIndexEntry.setName(value.toString().trim()); tableViewer.refresh(); tableViewer.updateContent(); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/RetentionIndexLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/RetentionIndexLabelProvider.java index 419016c9b6..c88cd63b91 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/RetentionIndexLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/RetentionIndexLabelProvider.java @@ -15,19 +15,22 @@ import java.util.Map; import org.eclipse.chemclipse.model.columns.IRetentionIndexEntry; -import org.eclipse.chemclipse.model.core.AbstractChromatogram; +import org.eclipse.chemclipse.model.core.IChromatogramOverview; import org.eclipse.chemclipse.model.preferences.PreferenceSupplier; import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; +import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider; import org.eclipse.chemclipse.support.text.ValueFormat; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.jface.viewers.ITableLabelProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.swt.graphics.Image; public class RetentionIndexLabelProvider extends LabelProvider implements ITableLabelProvider { - public static final String RETENTION_TIME = "Retention Time (Minutes)"; - public static final String RETENTION_INDEX = "Retention Index"; + public static final String RETENTION_TIME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RETENTION_TIME_MINUTES); + public static final String RETENTION_INDEX = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RETENTION_INDEX); public static final String NAME = "Name"; // public static final String[] TITLES = { // @@ -66,11 +69,10 @@ public String getColumnText(Object element, int columnIndex) { element = entry.getValue(); } // - if(element instanceof IRetentionIndexEntry) { - IRetentionIndexEntry retentionIndexEntry = (IRetentionIndexEntry)element; + if(element instanceof IRetentionIndexEntry retentionIndexEntry) { switch(columnIndex) { case 0: - text = decimalFormat.format(retentionIndexEntry.getRetentionTime() / AbstractChromatogram.MINUTE_CORRELATION_FACTOR); + text = decimalFormat.format(retentionIndexEntry.getRetentionTime() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR); break; case 1: if(PreferenceSupplier.showRetentionIndexWithoutDecimals()) { @@ -89,8 +91,9 @@ public String getColumnText(Object element, int columnIndex) { return text; } + @Override public Image getImage(Object element) { - return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_PEAK, IApplicationImage.SIZE_16x16); + return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_PEAK, IApplicationImageProvider.SIZE_16x16); } } \ No newline at end of file diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/RetentionIndexListFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/RetentionIndexListFilter.java index 263d33f73c..56f1719540 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/RetentionIndexListFilter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/RetentionIndexListFilter.java @@ -41,9 +41,8 @@ public boolean matchElement(Object element) { return true; } // - if(element instanceof IRetentionIndexEntry) { + if(element instanceof IRetentionIndexEntry retentionIndexEntry) { // - IRetentionIndexEntry retentionIndexEntry = (IRetentionIndexEntry)element; String name = (caseSensitive) ? retentionIndexEntry.getName() : retentionIndexEntry.getName().toLowerCase(); searchText = (caseSensitive) ? searchText : searchText.toLowerCase(); if(name.matches(searchText)) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/RetentionIndexTableComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/RetentionIndexTableComparator.java index 8601478516..de0968cefa 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/RetentionIndexTableComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/RetentionIndexTableComparator.java @@ -22,9 +22,7 @@ public class RetentionIndexTableComparator extends AbstractRecordTableComparator public int compare(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof IRetentionIndexEntry && e2 instanceof IRetentionIndexEntry) { - IRetentionIndexEntry retentionIndexEntry1 = (IRetentionIndexEntry)e1; - IRetentionIndexEntry retentionIndexEntry2 = (IRetentionIndexEntry)e2; + if(e1 instanceof IRetentionIndexEntry retentionIndexEntry1 && e2 instanceof IRetentionIndexEntry retentionIndexEntry2) { switch(getPropertyIndex()) { case 0: sortOrder = Integer.compare(retentionIndexEntry2.getRetentionTime(), retentionIndexEntry1.getRetentionTime()); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanInfoLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanInfoLabelProvider.java index b55914769a..ed09e974da 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanInfoLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanInfoLabelProvider.java @@ -13,29 +13,32 @@ import java.text.DecimalFormat; -import org.eclipse.chemclipse.model.core.AbstractChromatogram; +import org.eclipse.chemclipse.model.core.IChromatogramOverview; import org.eclipse.chemclipse.msd.model.core.IScanMSD; import org.eclipse.chemclipse.msd.model.support.ScanSupport; import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; +import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.preferences.PreferenceConstants; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.swt.graphics.Image; public class ScanInfoLabelProvider extends AbstractChemClipseLabelProvider { - public static final String LABEL_EMPTY = "EMPTY"; - public static final String LABEL_SIM = "SIM"; - public static final String LABEL_SCAN = "SCAN"; + public static final String LABEL_EMPTY = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.EMPTY_CAPS); + public static final String LABEL_SIM = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SIM); + public static final String LABEL_SCAN = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SCAN_CAPS); public static final String LABEL_DOTS = "..."; public static final String LABEL_BLANK = "--"; // - public static final String SCAN = "Scan#"; - public static final String RETENTION_TIME = "Time [min]"; - public static final String COUNT_IONS = "Count Ions"; - public static final String CLASSIFICATION = "SIM/SCAN"; + public static final String SCAN = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SCAN_HASH); + public static final String RETENTION_TIME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TIME_MIN); + public static final String COUNT_IONS = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COUNT_IONS); + public static final String CLASSIFICATION = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SIM_SCAN); public static final String IONS = "m/z..."; // private IPreferenceStore preferenceStore = Activator.getDefault().getPreferenceStore(); @@ -77,15 +80,14 @@ public String getColumnText(Object element, int columnIndex) { DecimalFormat decimalFormat = getDecimalFormat(); String text = ""; - if(element instanceof IScanMSD) { - IScanMSD scanMSD = (IScanMSD)element; + if(element instanceof IScanMSD scanMSD) { int numberOfIons = scanMSD.getNumberOfIons(); switch(columnIndex) { case 0: text = Integer.toString(scanMSD.getScanNumber()); break; case 1: - text = decimalFormat.format(scanMSD.getRetentionTime() / AbstractChromatogram.MINUTE_CORRELATION_FACTOR); + text = decimalFormat.format(scanMSD.getRetentionTime() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR); break; case 2: text = Integer.toString(numberOfIons); @@ -111,8 +113,9 @@ public String getColumnText(Object element, int columnIndex) { return text; } + @Override public Image getImage(Object element) { - return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_MASS_SPECTRUM, IApplicationImage.SIZE_16x16); + return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_MASS_SPECTRUM, IApplicationImageProvider.SIZE_16x16); } } \ No newline at end of file diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanInfoTableComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanInfoTableComparator.java index 725e9af7da..b5bae701f7 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanInfoTableComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanInfoTableComparator.java @@ -22,9 +22,7 @@ public class ScanInfoTableComparator extends AbstractRecordTableComparator imple public int compare(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof IScanMSD && e2 instanceof IScanMSD) { - IScanMSD ion1 = (IScanMSD)e1; - IScanMSD ion2 = (IScanMSD)e2; + if(e1 instanceof IScanMSD ion1 && e2 instanceof IScanMSD ion2) { // switch(getPropertyIndex()) { case 0: diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanLabelProvider.java index 537030aae0..ec16b72a4b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanLabelProvider.java @@ -14,12 +14,13 @@ import java.text.DecimalFormat; import org.eclipse.chemclipse.csd.model.core.IScanCSD; -import org.eclipse.chemclipse.model.core.AbstractChromatogram; +import org.eclipse.chemclipse.model.core.IChromatogramOverview; import org.eclipse.chemclipse.model.types.DataType; import org.eclipse.chemclipse.msd.model.core.IIon; import org.eclipse.chemclipse.msd.model.core.IIonTransition; import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; +import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider; import org.eclipse.chemclipse.support.text.ValueFormat; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; import org.eclipse.chemclipse.ux.extension.xxd.ui.preferences.PreferenceConstants; @@ -92,7 +93,7 @@ public void setTotalIntensity(double minIntensity, double maxIntensity) { public Image getColumnImage(Object element, int columnIndex) { if(columnIndex == 0) { - return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_ION, IApplicationImage.SIZE_16x16); + return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_ION, IApplicationImageProvider.SIZE_16x16); } else { return null; } @@ -127,8 +128,7 @@ public String getColumnText(Object element, int columnIndex) { private String getNominalMSD(Object element, int columnIndex) { String text = ""; - if(element instanceof IIon) { - IIon ion = (IIon)element; + if(element instanceof IIon ion) { switch(columnIndex) { case 0: text = decimalFormatNominalMSD.format(ion.getIon()); @@ -149,8 +149,7 @@ private String getNominalMSD(Object element, int columnIndex) { private String getTandemMSD(Object element, int columnIndex) { String text = ""; - if(element instanceof IIon) { - IIon ion = (IIon)element; + if(element instanceof IIon ion) { IIonTransition ionTransition = ion.getIonTransition(); switch(columnIndex) { case 0: // m/z (normal 28.3 or with Transition 128 > 78.4) @@ -188,8 +187,7 @@ private String getTandemMSD(Object element, int columnIndex) { private String getHighResolutionMSD(Object element, int columnIndex) { String text = ""; - if(element instanceof IIon) { - IIon ion = (IIon)element; + if(element instanceof IIon ion) { switch(columnIndex) { case 0: text = decimalFormatHighResMSD.format(ion.getIon()); @@ -210,11 +208,10 @@ private String getHighResolutionMSD(Object element, int columnIndex) { private String getCSD(Object element, int columnIndex) { String text = ""; - if(element instanceof IScanCSD) { - IScanCSD scanCSD = (IScanCSD)element; + if(element instanceof IScanCSD scanCSD) { switch(columnIndex) { case 0: - text = decimalFormatCSD.format(scanCSD.getRetentionTime() / AbstractChromatogram.MINUTE_CORRELATION_FACTOR); + text = decimalFormatCSD.format(scanCSD.getRetentionTime() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR); break; case 1: text = decimalFormatIntensity.format(scanCSD.getTotalSignal()); @@ -237,8 +234,7 @@ private String getCSD(Object element, int columnIndex) { private String getWSD(Object element, int columnIndex) { String text = ""; - if(element instanceof IScanSignalWSD) { - IScanSignalWSD scanSignal = (IScanSignalWSD)element; + if(element instanceof IScanSignalWSD scanSignal) { switch(columnIndex) { case 0: text = decimalFormatWSD.format(scanSignal.getWavelength()); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanSignalEditingSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanSignalEditingSupport.java index 9897884521..862b72e202 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanSignalEditingSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanSignalEditingSupport.java @@ -31,6 +31,7 @@ public class ScanSignalEditingSupport extends EditingSupport { private String column; public ScanSignalEditingSupport(ExtendedTableViewer tableViewer, String column) { + super(tableViewer); this.column = column; this.cellEditor = new TextCellEditor(tableViewer.getTable()); @@ -57,14 +58,11 @@ protected Object getValue(Object element) { boolean editIsEnabled = tableViewer.isEditEnabled(); if(editIsEnabled && column.equals(ScanLabelProvider.INTENSITY)) { - if(element instanceof IIon) { - IIon ion = (IIon)element; + if(element instanceof IIon ion) { return Float.toString(ion.getAbundance()); - } else if(element instanceof IScanSignalWSD) { - IScanSignalWSD scanSignalWSD = (IScanSignalWSD)element; + } else if(element instanceof IScanSignalWSD scanSignalWSD) { return Float.toString(scanSignalWSD.getAbundance()); - } else if(element instanceof IScanCSD) { - IScanCSD scanCSD = (IScanCSD)element; + } else if(element instanceof IScanCSD scanCSD) { return Float.toString(scanCSD.getTotalSignal()); } } @@ -77,16 +75,14 @@ protected void setValue(Object element, Object value) { if(column.equals(ScanLabelProvider.INTENSITY)) { float abundance = parseValue(value); if(abundance > 0.0f) { - if(element instanceof IIon) { - IIon ion = (IIon)element; + if(element instanceof IIon ion) { try { ion.setAbundance(abundance); updateTable(); } catch(AbundanceLimitExceededException e) { logger.warn(e); } - } else if(element instanceof IScanSignalWSD) { - IScanSignalWSD scanSignalWSD = (IScanSignalWSD)element; + } else if(element instanceof IScanSignalWSD scanSignalWSD) { scanSignalWSD.setAbundance(abundance); updateTable(); } else if(element instanceof IScanCSD) { @@ -101,8 +97,7 @@ protected void setValue(Object element, Object value) { private void updateTable() { - if(tableViewer instanceof ScanTableUI) { - ScanTableUI scanTableUI = (ScanTableUI)tableViewer; + if(tableViewer instanceof ScanTableUI scanTableUI) { scanTableUI.updateScan(); } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanSignalListFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanSignalListFilter.java index 13d1d11ffc..b04445f633 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanSignalListFilter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanSignalListFilter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -24,6 +24,7 @@ public class ScanSignalListFilter extends ViewerFilter { private boolean caseSensitive; public ScanSignalListFilter() { + } public void setSearchText(String searchText, boolean caseSensitive) { @@ -48,8 +49,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) { searchText = searchText.toLowerCase(); } // - if(element instanceof IIon) { - IIon ion = (IIon)element; + if(element instanceof IIon ion) { IIonTransition ionTransition = ion.getIonTransition(); if(ionTransition != null) { if(Double.toString(ionTransition.getQ3Ion()).contains(searchText)) { @@ -60,13 +60,11 @@ public boolean select(Viewer viewer, Object parentElement, Object element) { } else if(Double.toString(ion.getIon()).contains(searchText)) { return true; } - } else if(element instanceof IScanCSD) { - IScanCSD scanCSD = (IScanCSD)element; + } else if(element instanceof IScanCSD scanCSD) { if(Float.toString(scanCSD.getTotalSignal()).contains(searchText)) { return true; } - } else if(element instanceof IScanSignalWSD) { - IScanSignalWSD scanSignalWSD = (IScanSignalWSD)element; + } else if(element instanceof IScanSignalWSD scanSignalWSD) { if(Double.toString(scanSignalWSD.getWavelength()).contains(searchText)) { return true; } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanTableComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanTableComparator.java index ba8f5d979d..4848531268 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanTableComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/ScanTableComparator.java @@ -25,6 +25,7 @@ public class ScanTableComparator extends AbstractRecordTableComparator implement private DataType dataType; public ScanTableComparator(DataType dataType) { + this.dataType = dataType; } @@ -57,9 +58,7 @@ public int compare(Viewer viewer, Object e1, Object e2) { private int getNominalMSD(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof IIon && e2 instanceof IIon) { - IIon ion1 = (IIon)e1; - IIon ion2 = (IIon)e2; + if(e1 instanceof IIon ion1 && e2 instanceof IIon ion2) { // switch(getPropertyIndex()) { case 0: @@ -84,9 +83,7 @@ private int getNominalMSD(Viewer viewer, Object e1, Object e2) { private int getTandemMSD(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof IIon && e2 instanceof IIon) { - IIon ion1 = (IIon)e1; - IIon ion2 = (IIon)e2; + if(e1 instanceof IIon ion1 && e2 instanceof IIon ion2) { IIonTransition ionTransition1 = ion1.getIonTransition(); IIonTransition ionTransition2 = ion2.getIonTransition(); // @@ -128,9 +125,7 @@ private int getTandemMSD(Viewer viewer, Object e1, Object e2) { private int getHighResolutionMSD(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof IIon && e2 instanceof IIon) { - IIon ion1 = (IIon)e1; - IIon ion2 = (IIon)e2; + if(e1 instanceof IIon ion1 && e2 instanceof IIon ion2) { // switch(getPropertyIndex()) { case 0: @@ -155,9 +150,7 @@ private int getHighResolutionMSD(Viewer viewer, Object e1, Object e2) { private int getCSD(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof IScanCSD && e2 instanceof IScanCSD) { - IScanCSD scanCSD1 = (IScanCSD)e1; - IScanCSD scanCSD2 = (IScanCSD)e2; + if(e1 instanceof IScanCSD scanCSD1 && e2 instanceof IScanCSD scanCSD2) { // switch(getPropertyIndex()) { case 0: @@ -182,9 +175,7 @@ private int getCSD(Viewer viewer, Object e1, Object e2) { private int getWSD(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof IScanSignalWSD && e2 instanceof IScanSignalWSD) { - IScanSignalWSD scanSignalWSD1 = (IScanSignalWSD)e1; - IScanSignalWSD scanSignalWSD2 = (IScanSignalWSD)e2; + if(e1 instanceof IScanSignalWSD scanSignalWSD1 && e2 instanceof IScanSignalWSD scanSignalWSD2) { // switch(getPropertyIndex()) { case 0: diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceFilesFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceFilesFilter.java index 7bb8c95384..9fb3152732 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceFilesFilter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceFilesFilter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -37,9 +37,8 @@ public boolean select(Viewer viewer, Object parentElement, Object element) { return true; } // - if(element instanceof File) { + if(element instanceof File file) { // - File file = (File)element; String name = file.getName(); // if(!caseSensitive) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceFilesLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceFilesLabelProvider.java index 2a4d61ccfe..8b304ff39c 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceFilesLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceFilesLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -16,13 +16,16 @@ import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; +import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.swt.graphics.Image; public class SequenceFilesLabelProvider extends AbstractChemClipseLabelProvider { - public static final String NAME = "Name"; - public static final String SIZE = "Size (KB)"; + public static final String NAME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NAME); + public static final String SIZE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SIZE_KB); // public static String[] TITLES = {// NAME, // @@ -48,8 +51,7 @@ public String getColumnText(Object element, int columnIndex) { DecimalFormat decimalFormat = getDecimalFormat(); String text = ""; - if(element instanceof File) { - File file = (File)element; + if(element instanceof File file) { // switch(columnIndex) { case 0: @@ -66,6 +68,6 @@ public String getColumnText(Object element, int columnIndex) { @Override public Image getImage(Object element) { - return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_SEQUENCE_LIST, IApplicationImage.SIZE_16x16); + return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_SEQUENCE_LIST, IApplicationImageProvider.SIZE_16x16); } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceFilesTableComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceFilesTableComparator.java index 9b2f1798a7..4f1fcd3cdd 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceFilesTableComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceFilesTableComparator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -23,9 +23,7 @@ public class SequenceFilesTableComparator extends AbstractRecordTableComparator public int compare(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof File && e2 instanceof File) { - File file1 = (File)e1; - File file2 = (File)e2; + if(e1 instanceof File file1 && e2 instanceof File file2) { // switch(getPropertyIndex()) { case 0: diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceListFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceListFilter.java index 44ec062027..462e8e641b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceListFilter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceListFilter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2019 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -37,8 +37,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) { } // // - if(element instanceof ISequenceRecord) { - ISequenceRecord sequenceRecord = (ISequenceRecord)element; + if(element instanceof ISequenceRecord sequenceRecord) { // String dataFile = sequenceRecord.getDataFile(); String processMethod = sequenceRecord.getProcessMethod(); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceListLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceListLabelProvider.java index 7c9c1875de..f5228bbab5 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceListLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceListLabelProvider.java @@ -16,22 +16,25 @@ import org.eclipse.chemclipse.converter.model.reports.ISequenceRecord; import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; +import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.swt.graphics.Image; public class SequenceListLabelProvider extends AbstractChemClipseLabelProvider { - public static final String SAMPLE_NAME = "Sample Name"; - public static final String DATA_PATH = "Data Path"; - public static final String DATA_FILE = "Data File"; - public static final String ADVICE = "Advice"; - public static final String VIAL = "Vial"; - public static final String SUBSTANCE = "Substance"; - public static final String DESCRIPTION = "Description"; - public static final String PROCESS_METHOD = "Process Method"; - public static final String MULTIPLIER = "Multiplier"; - public static final String INJECTION_VOLUME = "Injection Volume"; - public static final String REPORT_METHOD = "Report Method"; + public static final String SAMPLE_NAME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SAMPLE_NAME); + public static final String DATA_PATH = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.DATA_PATH); + public static final String DATA_FILE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.DATA_FILE); + public static final String ADVICE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.ADVICE); + public static final String VIAL = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.VIAL); + public static final String SUBSTANCE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SUBSTANCE); + public static final String DESCRIPTION = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.DESCRIPTION); + public static final String PROCESS_METHOD = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROCESS_METHOD); + public static final String MULTIPLIER = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.MULTIPLIER); + public static final String INJECTION_VOLUME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.INJECTION_VOLUME); + public static final String REPORT_METHOD = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.REPORT_METHOD); // public static String[] TITLES = {// SAMPLE_NAME, // @@ -67,8 +70,7 @@ public Image getColumnImage(Object element, int columnIndex) { if(columnIndex == 0) { return getImage(element); } else if(columnIndex == 3) { - if(element instanceof ISequenceRecord) { - ISequenceRecord sequenceRecord = (ISequenceRecord)element; + if(element instanceof ISequenceRecord sequenceRecord) { switch(sequenceRecord.getAdvice()) { case NONE: return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_STATUS_EMPTY, IApplicationImage.SIZE_16x16); @@ -87,8 +89,7 @@ public String getColumnText(Object element, int columnIndex) { DecimalFormat decimalFormat = getDecimalFormat(); String text = ""; - if(element instanceof ISequenceRecord) { - ISequenceRecord sequenceRecord = (ISequenceRecord)element; + if(element instanceof ISequenceRecord sequenceRecord) { // switch(columnIndex) { case 0: @@ -132,6 +133,6 @@ public String getColumnText(Object element, int columnIndex) { @Override public Image getImage(Object element) { - return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_PEAK, IApplicationImage.SIZE_16x16); + return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_PEAK, IApplicationImageProvider.SIZE_16x16); } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceListTableComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceListTableComparator.java index 1a1ecf852f..d29f051556 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceListTableComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SequenceListTableComparator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2019 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -22,9 +22,7 @@ public class SequenceListTableComparator extends AbstractRecordTableComparator i public int compare(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof ISequenceRecord && e2 instanceof ISequenceRecord) { - ISequenceRecord sequenceRecord1 = (ISequenceRecord)e1; - ISequenceRecord sequenceRecord2 = (ISequenceRecord)e2; + if(e1 instanceof ISequenceRecord sequenceRecord1 && e2 instanceof ISequenceRecord sequenceRecord2) { // switch(getPropertyIndex()) { case 0: diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SynonymsComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SynonymsComparator.java index db7df19f44..57aa7274f0 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SynonymsComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SynonymsComparator.java @@ -21,9 +21,7 @@ public class SynonymsComparator extends AbstractRecordTableComparator implements public int compare(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof String && e2 instanceof String) { - String value1 = (String)e1; - String value2 = (String)e2; + if(e1 instanceof String value1 && e2 instanceof String value2) { switch(getPropertyIndex()) { case 0: sortOrder = value1.compareTo(value2); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SynonymsLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SynonymsLabelProvider.java index 258103bb46..f5df55b5e0 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SynonymsLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/SynonymsLabelProvider.java @@ -13,12 +13,15 @@ import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; +import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.swt.graphics.Image; public class SynonymsLabelProvider extends AbstractChemClipseLabelProvider { - public static final String SYNONYM = "Synonym"; + public static final String SYNONYM = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SYNONYM); // public static final String[] TITLES = { // SYNONYM // @@ -56,6 +59,6 @@ public String getColumnText(Object element, int columnIndex) { @Override public Image getImage(Object element) { - return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_TAG, IApplicationImage.SIZE_16x16); + return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_TAG, IApplicationImageProvider.SIZE_16x16); } } \ No newline at end of file diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetListFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetListFilter.java index 0711bbf6db..556c2e8548 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetListFilter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetListFilter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2021 Lablicate GmbH. + * Copyright (c) 2017, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -43,8 +43,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) { return true; } // - if(element instanceof IIdentificationTarget) { - IIdentificationTarget target = (IIdentificationTarget)element; + if(element instanceof IIdentificationTarget target) { return libraryInformationSupport.containsSearchText(target.getLibraryInformation(), searchText, caseSensitive); } // diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetReferenceEditingSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetReferenceEditingSupport.java index 1b790caf82..9c0fe05978 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetReferenceEditingSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetReferenceEditingSupport.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 Lablicate GmbH. + * Copyright (c) 2020, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -59,15 +59,13 @@ protected boolean canEdit(Object element) { @Override protected Object getValue(Object element) { - if(element instanceof ITargetReference) { - ITargetReference targetReference = (ITargetReference)element; - switch(column) { - case TargetReferenceLabelProvider.VISIBLE: - if(targetDisplaySettings != null) { - return targetDisplaySettings.isVisible(targetReference); - } else { - return false; - } + if(element instanceof ITargetReference targetReference) { + if(column.equals(TargetReferenceLabelProvider.VISIBLE)) { + if(targetDisplaySettings != null) { + return targetDisplaySettings.isVisible(targetReference); + } else { + return false; + } } } return false; @@ -76,15 +74,12 @@ protected Object getValue(Object element) { @Override protected void setValue(Object element, Object value) { - if(element instanceof ITargetReference) { - ITargetReference targetReference = (ITargetReference)element; - switch(column) { - case TargetReferenceLabelProvider.VISIBLE: - if(targetDisplaySettings != null) { - boolean visible = (boolean)value; - targetDisplaySettings.setVisible(targetReference, visible); - } - break; + if(element instanceof ITargetReference targetReference) { + if(column.equals(TargetReferenceLabelProvider.VISIBLE)) { + if(targetDisplaySettings != null) { + boolean visible = (boolean)value; + targetDisplaySettings.setVisible(targetReference, visible); + } } tableViewer.refresh(); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetReferenceFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetReferenceFilter.java index e034a7174d..c189d70563 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetReferenceFilter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetReferenceFilter.java @@ -44,8 +44,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) { return true; } // - if(element instanceof ITargetReference && targetDisplaySettings != null) { - ITargetReference targetReference = (ITargetReference)element; + if(element instanceof ITargetReference targetReference && targetDisplaySettings != null) { String libraryField = targetReference.getTargetLabel(targetDisplaySettings.getLibraryField()); // if(!caseSensitive) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetReferenceLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetReferenceLabelProvider.java index f9f68837da..73750d315b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetReferenceLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetReferenceLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020, 2021 Lablicate GmbH. + * Copyright (c) 2020, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -18,15 +18,18 @@ import org.eclipse.chemclipse.model.targets.TargetReference; import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; +import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.swt.graphics.Image; public class TargetReferenceLabelProvider extends AbstractChemClipseLabelProvider { - public static final String VISIBLE = "Visible"; - public static final String ID = "ID"; - public static final String TYPE = "Type"; - public static final String LIBRARY_FIELD = "Library Field"; + public static final String VISIBLE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.VISIBLE); + public static final String ID = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.ID); + public static final String TYPE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TYPE); + public static final String LIBRARY_FIELD = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.LIBRARY_FIELD); // private ITargetDisplaySettings targetDisplaySettings = null; private Predicate visibilityFilter = null; @@ -60,12 +63,11 @@ public void setTargetDisplaySettings(ITargetDisplaySettings targetDisplaySetting public Image getColumnImage(Object element, int columnIndex) { if(columnIndex == 0) { - if(element instanceof ITargetReference) { - ITargetReference targetReference = (ITargetReference)element; + if(element instanceof ITargetReference targetReference) { if(visibilityFilter.test(targetReference)) { - return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_SELECTED, IApplicationImage.SIZE_16x16); + return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_SELECTED, IApplicationImageProvider.SIZE_16x16); } else { - return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_DESELECTED, IApplicationImage.SIZE_16x16); + return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_DESELECTED, IApplicationImageProvider.SIZE_16x16); } } } @@ -76,8 +78,7 @@ public Image getColumnImage(Object element, int columnIndex) { public String getColumnText(Object element, int columnIndex) { String text = ""; - if(element instanceof ITargetReference) { - ITargetReference targetReference = (ITargetReference)element; + if(element instanceof ITargetReference targetReference) { switch(columnIndex) { case 0: text = ""; // Visibility @@ -103,6 +104,6 @@ public String getColumnText(Object element, int columnIndex) { @Override public Image getImage(Object element) { - return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_TARGETS, IApplicationImage.SIZE_16x16); + return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_TARGETS, IApplicationImageProvider.SIZE_16x16); } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetReferenceTableComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetReferenceTableComparator.java index 6e615dc824..55ba45b633 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetReferenceTableComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetReferenceTableComparator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 Lablicate GmbH. + * Copyright (c) 2020, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -31,9 +31,7 @@ public void setTargetDisplaySettings(ITargetDisplaySettings targetDisplaySetting public int compare(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof ITargetReference && e2 instanceof ITargetReference) { - ITargetReference entry1 = (ITargetReference)e1; - ITargetReference entry2 = (ITargetReference)e2; + if(e1 instanceof ITargetReference entry1 && e2 instanceof ITargetReference entry2) { // switch(getPropertyIndex()) { case 0: diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetTemplateComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetTemplateComparator.java index a028f66711..a802af5b34 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetTemplateComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetTemplateComparator.java @@ -22,10 +22,7 @@ public class TargetTemplateComparator extends AbstractRecordTableComparator impl public int compare(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof TargetTemplate && e2 instanceof TargetTemplate) { - // - TargetTemplate targetTemplate1 = (TargetTemplate)e1; - TargetTemplate targetTemplate2 = (TargetTemplate)e2; + if(e1 instanceof TargetTemplate targetTemplate1 && e2 instanceof TargetTemplate targetTemplate2) { // switch(getPropertyIndex()) { case 0: diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetTemplateEditingSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetTemplateEditingSupport.java index e713bb626a..891ceca155 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetTemplateEditingSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetTemplateEditingSupport.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -46,8 +46,7 @@ protected boolean canEdit(Object element) { @Override protected Object getValue(Object element) { - if(element instanceof TargetTemplate) { - TargetTemplate targetTemplate = (TargetTemplate)element; + if(element instanceof TargetTemplate targetTemplate) { switch(column) { // case TargetTemplateLabelProvider.NAME: // return targetTemplate.getName(); @@ -67,8 +66,7 @@ protected Object getValue(Object element) { @Override protected void setValue(Object element, Object value) { - if(element instanceof TargetTemplate) { - TargetTemplate targetTemplate = (TargetTemplate)element; + if(element instanceof TargetTemplate targetTemplate) { switch(column) { // case TargetTemplateLabelProvider.NAME: // targetTemplate.setName((String)value); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetTemplateFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetTemplateFilter.java index f7d07a91f6..855d98e80c 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetTemplateFilter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetTemplateFilter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -36,8 +36,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) { return true; } // - if(element instanceof TargetTemplate) { - TargetTemplate targetTemplate = (TargetTemplate)element; + if(element instanceof TargetTemplate targetTemplate) { String name = targetTemplate.getName(); String casNumber = targetTemplate.getCasNumber(); String comment = targetTemplate.getComments(); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetTemplateLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetTemplateLabelProvider.java index 5a5641998b..6a63b3e36e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetTemplateLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetTemplateLabelProvider.java @@ -14,6 +14,7 @@ import org.eclipse.chemclipse.model.identifier.template.TargetTemplate; import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; +import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; import org.eclipse.swt.graphics.Image; @@ -53,8 +54,7 @@ public Image getColumnImage(Object element, int columnIndex) { public String getColumnText(Object element, int columnIndex) { String text = ""; - if(element instanceof TargetTemplate) { - TargetTemplate targetTemplate = (TargetTemplate)element; + if(element instanceof TargetTemplate targetTemplate) { switch(columnIndex) { case 0: text = targetTemplate.getName(); @@ -81,6 +81,6 @@ public String getColumnText(Object element, int columnIndex) { @Override public Image getImage(Object element) { - return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_TARGETS, IApplicationImage.SIZE_16x16); + return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_TARGETS, IApplicationImageProvider.SIZE_16x16); } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetsComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetsComparator.java index fd0822bdba..05c7064c27 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetsComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetsComparator.java @@ -24,10 +24,8 @@ public class TargetsComparator extends AbstractRecordTableComparator implements public int compare(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof IIdentificationTarget && e2 instanceof IIdentificationTarget) { + if(e1 instanceof IIdentificationTarget entry1 && e2 instanceof IIdentificationTarget entry2) { // - IIdentificationTarget entry1 = (IIdentificationTarget)e1; - IIdentificationTarget entry2 = (IIdentificationTarget)e2; ILibraryInformation libraryInformation1 = entry1.getLibraryInformation(); IComparisonResult comparisonResult1 = entry1.getComparisonResult(); ILibraryInformation libraryInformation2 = entry2.getLibraryInformation(); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetsEditingSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetsEditingSupport.java index 7ff1944ecf..c84eb76b76 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetsEditingSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetsEditingSupport.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2016, 2020 Lablicate GmbH. + * Copyright (c) 2016, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -15,6 +15,8 @@ import org.eclipse.chemclipse.support.events.IChemClipseEvents; import org.eclipse.chemclipse.support.ui.swt.ExtendedTableViewer; import org.eclipse.chemclipse.swt.ui.notifier.UpdateNotifierUI; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.CheckboxCellEditor; import org.eclipse.jface.viewers.EditingSupport; @@ -57,27 +59,33 @@ protected boolean canEdit(Object element) { @Override protected Object getValue(Object element) { - if(element instanceof IIdentificationTarget) { - IIdentificationTarget identificationTarget = (IIdentificationTarget)element; - switch(column) { - case TargetsLabelProvider.VERIFIED_MANUALLY: - return identificationTarget.isManuallyVerified(); - case TargetsLabelProvider.NAME: - return identificationTarget.getLibraryInformation().getName(); - case TargetsLabelProvider.CAS: - return identificationTarget.getLibraryInformation().getCasNumber(); - case TargetsLabelProvider.COMMENTS: - return identificationTarget.getLibraryInformation().getComments(); - case TargetsLabelProvider.FORMULA: - return identificationTarget.getLibraryInformation().getFormula(); - case TargetsLabelProvider.SMILES: - return identificationTarget.getLibraryInformation().getSmiles(); - case TargetsLabelProvider.INCHI: - return identificationTarget.getLibraryInformation().getInChI(); - case TargetsLabelProvider.CONTRIBUTOR: - return identificationTarget.getLibraryInformation().getContributor(); - case TargetsLabelProvider.REFERENCE_ID: - return identificationTarget.getLibraryInformation().getReferenceIdentifier(); + if(element instanceof IIdentificationTarget identificationTarget) { + if(column.equals(TargetsLabelProvider.VERIFIED_MANUALLY)) { + return identificationTarget.isManuallyVerified(); + } + if(column.equals(TargetsLabelProvider.NAME)) { + return identificationTarget.getLibraryInformation().getName(); + } + if(column.equals(TargetsLabelProvider.CAS)) { + return identificationTarget.getLibraryInformation().getCasNumber(); + } + if(column.equals(TargetsLabelProvider.COMMENTS)) { + return identificationTarget.getLibraryInformation().getComments(); + } + if(column.equals(TargetsLabelProvider.FORMULA)) { + return identificationTarget.getLibraryInformation().getFormula(); + } + if(column.equals(TargetsLabelProvider.SMILES)) { + return identificationTarget.getLibraryInformation().getSmiles(); + } + if(column.equals(TargetsLabelProvider.INCHI)) { + return identificationTarget.getLibraryInformation().getInChI(); + } + if(column.equals(TargetsLabelProvider.CONTRIBUTOR)) { + return identificationTarget.getLibraryInformation().getContributor(); + } + if(column.equals(TargetsLabelProvider.REFERENCE_ID)) { + return identificationTarget.getLibraryInformation().getReferenceIdentifier(); } } return false; @@ -86,39 +94,36 @@ protected Object getValue(Object element) { @Override protected void setValue(Object element, Object value) { - if(element instanceof IIdentificationTarget) { - IIdentificationTarget identificationTarget = (IIdentificationTarget)element; - switch(column) { - case TargetsLabelProvider.VERIFIED_MANUALLY: - identificationTarget.setManuallyVerified((boolean)value); - break; - case TargetsLabelProvider.NAME: - identificationTarget.getLibraryInformation().setName((String)value); - break; - case TargetsLabelProvider.CAS: - identificationTarget.getLibraryInformation().setCasNumber((String)value); - break; - case TargetsLabelProvider.COMMENTS: - identificationTarget.getLibraryInformation().setComments((String)value); - break; - case TargetsLabelProvider.FORMULA: - identificationTarget.getLibraryInformation().setFormula((String)value); - break; - case TargetsLabelProvider.SMILES: - identificationTarget.getLibraryInformation().setSmiles((String)value); - break; - case TargetsLabelProvider.INCHI: - identificationTarget.getLibraryInformation().setInChI((String)value); - break; - case TargetsLabelProvider.CONTRIBUTOR: - identificationTarget.getLibraryInformation().setContributor((String)value); - break; - case TargetsLabelProvider.REFERENCE_ID: - identificationTarget.getLibraryInformation().setReferenceIdentifier((String)value); - break; - } - tableViewer.refresh(); - UpdateNotifierUI.update(tableViewer.getTable().getDisplay(), IChemClipseEvents.TOPIC_EDITOR_CHROMATOGRAM_UPDATE, "The target has been edited."); + if(element instanceof IIdentificationTarget identificationTarget) { + if(column.equals(TargetsLabelProvider.VERIFIED_MANUALLY)) { + identificationTarget.setManuallyVerified((boolean)value); + } + if(column.equals(TargetsLabelProvider.NAME)) { + identificationTarget.getLibraryInformation().setName((String)value); + } + if(column.equals(TargetsLabelProvider.CAS)) { + identificationTarget.getLibraryInformation().setCasNumber((String)value); + } + if(column.equals(TargetsLabelProvider.COMMENTS)) { + identificationTarget.getLibraryInformation().setComments((String)value); + } + if(column.equals(TargetsLabelProvider.FORMULA)) { + identificationTarget.getLibraryInformation().setFormula((String)value); + } + if(column.equals(TargetsLabelProvider.SMILES)) { + identificationTarget.getLibraryInformation().setSmiles((String)value); + } + if(column.equals(TargetsLabelProvider.INCHI)) { + identificationTarget.getLibraryInformation().setInChI((String)value); + } + if(column.equals(TargetsLabelProvider.CONTRIBUTOR)) { + identificationTarget.getLibraryInformation().setContributor((String)value); + } + if(column.equals(TargetsLabelProvider.REFERENCE_ID)) { + identificationTarget.getLibraryInformation().setReferenceIdentifier((String)value); + } } + tableViewer.refresh(); + UpdateNotifierUI.update(tableViewer.getTable().getDisplay(), IChemClipseEvents.TOPIC_EDITOR_CHROMATOGRAM_UPDATE, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TARGET_HAS_BEEN_EDITED)); } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetsLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetsLabelProvider.java index 6b4725213e..5b1926707d 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetsLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TargetsLabelProvider.java @@ -13,47 +13,50 @@ import java.text.DecimalFormat; -import org.eclipse.chemclipse.model.core.AbstractChromatogram; +import org.eclipse.chemclipse.model.core.IChromatogramOverview; import org.eclipse.chemclipse.model.identifier.IComparisonResult; import org.eclipse.chemclipse.model.identifier.IIdentificationTarget; import org.eclipse.chemclipse.model.identifier.ILibraryInformation; import org.eclipse.chemclipse.model.preferences.PreferenceSupplier; import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; +import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider; import org.eclipse.chemclipse.support.text.ValueFormat; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.preferences.PreferenceConstants; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.swt.graphics.Image; public class TargetsLabelProvider extends AbstractChemClipseLabelProvider { - public static final String VERIFIED_MANUALLY = "Verified (manually)"; - public static final String NAME = "Name"; - public static final String MATCH_FACTOR = "Match Factor"; - public static final String REVERSE_MATCH_FACTOR = "Reverse Match Factor"; - public static final String MATCH_FACTOR_DIRECT = "Match Factor Direct"; - public static final String REVERSE_MATCH_FACTOR_DIRECT = "Reverse Match Factor Direct"; - public static final String PROBABILITY = "Probability"; - public static final String MOL_WEIGHT = "Mol Weight"; - public static final String EXACT_MASS = "Excact Mass"; - public static final String ADVISE = "Advise"; - public static final String IDENTIFIER = "Identifier"; - public static final String MISCELLANEOUS = "Miscellaneous"; - public static final String DATABASE = "Database"; - public static final String DATABASE_INDEX = "Database Index"; - public static final String RATING = "Rating"; + public static final String VERIFIED_MANUALLY = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.VERIFIED_MANUALLY); + public static final String NAME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NAME); + public static final String MATCH_FACTOR = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.MATCH_FACTOR); + public static final String REVERSE_MATCH_FACTOR = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.REVERSE_MATCH_FACTOR); + public static final String MATCH_FACTOR_DIRECT = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.MATCH_FACTOR_DIRECT); + public static final String REVERSE_MATCH_FACTOR_DIRECT = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.REVERSE_MATCH_FACTOR_DIRECT); + public static final String PROBABILITY = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROBABILITY); + public static final String MOL_WEIGHT = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.MOL_WEIGHT); + public static final String EXACT_MASS = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.EXACT_MASS); + public static final String ADVICE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.ADVICE); + public static final String IDENTIFIER = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.IDENTIFIER); + public static final String MISCELLANEOUS = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.MISCELLANEOUS); + public static final String DATABASE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.DATABASE); + public static final String DATABASE_INDEX = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.DATABASE_INDEX); + public static final String RATING = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RATING); public static final String CAS = "CAS"; - public static final String COMMENTS = "Comments"; - public static final String FORMULA = "Formula"; + public static final String COMMENTS = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COMMENTS); + public static final String FORMULA = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FORMULA); public static final String SMILES = "SMILES"; public static final String INCHI = "InChI"; public static final String INCHI_KEY = "InChI Key"; - public static final String CONTRIBUTOR = "Contributor"; - public static final String RETENTION_TIME = "Retention Time"; - public static final String RETENTION_INDEX = "Retention Index"; - public static final String REFERENCE_ID = "Reference ID"; + public static final String CONTRIBUTOR = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CONTRIBUTOR); + public static final String RETENTION_TIME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RETENTION_TIME); + public static final String RETENTION_INDEX = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RETENTION_INDEX); + public static final String REFERENCE_ID = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.REFERENCE_ID); // public static final int INDEX_RETENTION_TIME = 23; public static final int INDEX_RETENTION_INDEX = 24; @@ -76,7 +79,7 @@ public class TargetsLabelProvider extends AbstractChemClipseLabelProvider { INCHI_KEY, // MOL_WEIGHT, // EXACT_MASS, // - ADVISE, // + ADVICE, // IDENTIFIER, // MISCELLANEOUS, // COMMENTS, // @@ -123,13 +126,13 @@ public static String getRetentionTimeText(ILibraryInformation libraryInformation if(retentionTime != null) { if(preferenceStore.getBoolean(PreferenceConstants.P_TARGETS_TABLE_SHOW_DEVIATION_RT)) { int delta = libraryInformation.getRetentionTime() - retentionTime; - deltaRetentionTime = " [" + decimalFormat.format(delta / AbstractChromatogram.MINUTE_CORRELATION_FACTOR) + "]"; + deltaRetentionTime = " [" + decimalFormat.format(delta / IChromatogramOverview.MINUTE_CORRELATION_FACTOR) + "]"; } } /* * Label */ - String libraryRetentionTime = decimalFormat.format(libraryInformation.getRetentionTime() / AbstractChromatogram.MINUTE_CORRELATION_FACTOR); + String libraryRetentionTime = decimalFormat.format(libraryInformation.getRetentionTime() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR); return libraryRetentionTime + deltaRetentionTime; } @@ -170,27 +173,25 @@ public Image getColumnImage(Object element, int columnIndex) { /* * CheckBox */ - if(element instanceof IIdentificationTarget) { - IIdentificationTarget identificationTarget = (IIdentificationTarget)element; + if(element instanceof IIdentificationTarget identificationTarget) { if(identificationTarget.isManuallyVerified()) { - return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_SELECTED, IApplicationImage.SIZE_16x16); + return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_SELECTED, IApplicationImageProvider.SIZE_16x16); } else { - return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_DESELECTED, IApplicationImage.SIZE_16x16); + return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_DESELECTED, IApplicationImageProvider.SIZE_16x16); } } } else if(columnIndex == 1) { /* * Rating */ - if(element instanceof IIdentificationTarget) { - IIdentificationTarget identificationTarget = (IIdentificationTarget)element; + if(element instanceof IIdentificationTarget identificationTarget) { float rating = identificationTarget.getComparisonResult().getRating(); if(rating >= IComparisonResult.RATING_LIMIT_UP) { - return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_ARROW_UP, IApplicationImage.SIZE_16x16); + return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_ARROW_UP, IApplicationImageProvider.SIZE_16x16); } else if(rating >= IComparisonResult.RATING_LIMIT_EQUAL) { - return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_ARROW_EQUAL, IApplicationImage.SIZE_16x16); + return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_ARROW_EQUAL, IApplicationImageProvider.SIZE_16x16); } else { - return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_ARROW_DOWN, IApplicationImage.SIZE_16x16); + return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_ARROW_DOWN, IApplicationImageProvider.SIZE_16x16); } } } else if(columnIndex == 2) { @@ -208,8 +209,7 @@ public String getColumnText(Object element, int columnIndex) { DecimalFormat decimalFormat = getDecimalFormat(); // String text = ""; - if(element instanceof IIdentificationTarget) { - IIdentificationTarget identificationTarget = (IIdentificationTarget)element; + if(element instanceof IIdentificationTarget identificationTarget) { ILibraryInformation libraryInformation = identificationTarget.getLibraryInformation(); IComparisonResult comparisonResult = identificationTarget.getComparisonResult(); // @@ -299,6 +299,6 @@ public String getColumnText(Object element, int columnIndex) { @Override public Image getImage(Object element) { - return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_TARGETS, IApplicationImage.SIZE_16x16); + return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_TARGETS, IApplicationImageProvider.SIZE_16x16); } } \ No newline at end of file diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TimeRangesComparator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TimeRangesComparator.java index b9020107ec..5ac39905b2 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TimeRangesComparator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TimeRangesComparator.java @@ -22,10 +22,7 @@ public class TimeRangesComparator extends AbstractRecordTableComparator implemen public int compare(Viewer viewer, Object e1, Object e2) { int sortOrder = 0; - if(e1 instanceof TimeRange && e2 instanceof TimeRange) { - // - TimeRange timeRange1 = (TimeRange)e1; - TimeRange timeRange2 = (TimeRange)e2; + if(e1 instanceof TimeRange timeRange1 && e2 instanceof TimeRange timeRange2) { // switch(getPropertyIndex()) { case 0: diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TimeRangesEditingSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TimeRangesEditingSupport.java index 5dedab5792..f0f38c7148 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TimeRangesEditingSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TimeRangesEditingSupport.java @@ -29,6 +29,7 @@ public class TimeRangesEditingSupport extends EditingSupport { private DecimalFormat decimalFormat = ValueFormat.getDecimalFormatEnglish("0.000"); public TimeRangesEditingSupport(ExtendedTableViewer tableViewer, String column) { + super(tableViewer); this.column = column; this.cellEditor = new TextCellEditor(tableViewer.getTable()); @@ -50,15 +51,15 @@ protected boolean canEdit(Object element) { @Override protected Object getValue(Object element) { - if(element instanceof TimeRange) { - TimeRange timeRange = (TimeRange)element; - switch(column) { - case TimeRangesLabelProvider.START: - return formatValue(timeRange.getStart()); - case TimeRangesLabelProvider.CENTER: - return formatValue(timeRange.getCenter()); - case TimeRangesLabelProvider.STOP: - return formatValue(timeRange.getStop()); + if(element instanceof TimeRange timeRange) { + if(column.equals(TimeRangesLabelProvider.START)) { + return formatValue(timeRange.getStart()); + } + if(column.equals(TimeRangesLabelProvider.CENTER)) { + return formatValue(timeRange.getCenter()); + } + if(column.equals(TimeRangesLabelProvider.STOP)) { + return formatValue(timeRange.getStop()); } } return false; @@ -67,18 +68,15 @@ protected Object getValue(Object element) { @Override protected void setValue(Object element, Object value) { - if(element instanceof TimeRange) { - TimeRange timeRange = (TimeRange)element; - switch(column) { - case TimeRangesLabelProvider.START: - timeRange.updateStart(parseValue(value)); - break; - case TimeRangesLabelProvider.CENTER: - timeRange.updateCenter(parseValue(value)); - break; - case TimeRangesLabelProvider.STOP: - timeRange.updateStop(parseValue(value)); - break; + if(element instanceof TimeRange timeRange) { + if(column.equals(TimeRangesLabelProvider.START)) { + timeRange.updateStart(parseValue(value)); + } + if(column.equals(TimeRangesLabelProvider.CENTER)) { + timeRange.updateCenter(parseValue(value)); + } + if(column.equals(TimeRangesLabelProvider.STOP)) { + timeRange.updateStop(parseValue(value)); } tableViewer.refresh(); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TimeRangesFilter.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TimeRangesFilter.java index a343c85328..a978621431 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TimeRangesFilter.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TimeRangesFilter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 Lablicate GmbH. + * Copyright (c) 2019, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -36,8 +36,7 @@ public boolean select(Viewer viewer, Object parentElement, Object element) { return true; } // - if(element instanceof TimeRange) { - TimeRange timeRange = (TimeRange)element; + if(element instanceof TimeRange timeRange) { String identifier = timeRange.getIdentifier(); // if(!caseSensitive) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TimeRangesLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TimeRangesLabelProvider.java index a102a20d64..32de1fd11e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TimeRangesLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/TimeRangesLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Lablicate GmbH. + * Copyright (c) 2019, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -16,16 +16,19 @@ import org.eclipse.chemclipse.model.ranges.TimeRange; import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; +import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider; import org.eclipse.chemclipse.support.text.ValueFormat; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.swt.graphics.Image; public class TimeRangesLabelProvider extends AbstractChemClipseLabelProvider { - public static final String IDENTIFIER = "Identifier"; - public static final String START = "Start Time [min]"; - public static final String CENTER = "Center Time [min]"; - public static final String STOP = "Stop Time [min]"; + public static final String IDENTIFIER = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.IDENTIFIER); + public static final String START = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.START_TIME_MIN); + public static final String CENTER = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CENTER_TIME_MIN); + public static final String STOP = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.STOP_TIME_MIN); // private DecimalFormat decimalFormat = ValueFormat.getDecimalFormatEnglish("0.000"); // @@ -55,8 +58,7 @@ public Image getColumnImage(Object element, int columnIndex) { public String getColumnText(Object element, int columnIndex) { String text = ""; - if(element instanceof TimeRange) { - TimeRange timeRange = (TimeRange)element; + if(element instanceof TimeRange timeRange) { switch(columnIndex) { case 0: text = timeRange.getIdentifier(); @@ -83,6 +85,6 @@ private String calculateRetentionTimeMinutes(int retentionTime) { @Override public Image getImage(Object element) { - return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_TARGETS, IApplicationImage.SIZE_16x16); + return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_TARGETS, IApplicationImageProvider.SIZE_16x16); } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/WellDataEditingSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/WellDataEditingSupport.java index b690655e8d..58adc80c00 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/WellDataEditingSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/WellDataEditingSupport.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -44,7 +44,7 @@ protected CellEditor getCellEditor(Object element) { @Override protected boolean canEdit(Object element) { - if(column == WellDataLabelProvider.VALUE) { + if(column.equals(WellDataLabelProvider.VALUE)) { return tableViewer.isEditEnabled(); } else { return false; @@ -57,9 +57,8 @@ protected Object getValue(Object element) { if(element instanceof Map.Entry) { Map.Entry entry = (Map.Entry)element; - switch(column) { - case WellDataLabelProvider.VALUE: - return entry.getValue(); + if(column.equals(WellDataLabelProvider.VALUE)) { + return entry.getValue(); } } return false; @@ -73,10 +72,8 @@ protected void setValue(Object element, Object value) { IWell well = tableViewer.getWell(); if(well != null) { Map.Entry entry = (Map.Entry)element; - switch(column) { - case WellDataLabelProvider.VALUE: - well.putData(entry.getKey(), (String)value); - break; + if(column.equals(WellDataLabelProvider.VALUE)) { + well.putData(entry.getKey(), (String)value); } tableViewer.refresh(); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/WellDataLabelProvider.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/WellDataLabelProvider.java index b5b7366be2..a15c5ced07 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/WellDataLabelProvider.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/provider/WellDataLabelProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -15,13 +15,16 @@ import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; +import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider; import org.eclipse.chemclipse.support.ui.provider.AbstractChemClipseLabelProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.swt.graphics.Image; public class WellDataLabelProvider extends AbstractChemClipseLabelProvider { - public static final String NAME = "Name"; - public static final String VALUE = "Value"; + public static final String NAME = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NAME); + public static final String VALUE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.VALUE); // public static final String[] TITLES = { // NAME, // @@ -63,7 +66,6 @@ public String getColumnText(Object element, int columnIndex) { @Override public Image getImage(Object element) { - Image image = ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_INFO, IApplicationImage.SIZE_16x16); - return image; + return ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_INFO, IApplicationImageProvider.SIZE_16x16); } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/ChromatogramExportRunnable.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/ChromatogramExportRunnable.java index c1bbe24fe7..83a9216b38 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/ChromatogramExportRunnable.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/ChromatogramExportRunnable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -60,20 +60,17 @@ public void run(final IProgressMonitor monitor) throws InvocationTargetException case MSD_TANDEM: case MSD_HIGHRES: case MSD: - if(chromatogram instanceof IChromatogramMSD) { - IChromatogramMSD chromatogramMSD = (IChromatogramMSD)chromatogram; + if(chromatogram instanceof IChromatogramMSD chromatogramMSD) { processingInfo = ChromatogramConverterMSD.getInstance().convert(file, chromatogramMSD, supplier.getId(), monitor); } break; case CSD: - if(chromatogram instanceof IChromatogramCSD) { - IChromatogramCSD chromatogramCSD = (IChromatogramCSD)chromatogram; + if(chromatogram instanceof IChromatogramCSD chromatogramCSD) { processingInfo = ChromatogramConverterCSD.getInstance().convert(file, chromatogramCSD, supplier.getId(), monitor); } break; case WSD: - if(chromatogram instanceof IChromatogramWSD) { - IChromatogramWSD chromatogramWSD = (IChromatogramWSD)chromatogram; + if(chromatogram instanceof IChromatogramWSD chromatogramWSD) { processingInfo = ChromatogramConverterWSD.getInstance().convert(file, chromatogramWSD, supplier.getId(), monitor); } break; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/ChromatogramLengthModifier.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/ChromatogramLengthModifier.java index f3b8ca6684..54334cb402 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/ChromatogramLengthModifier.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/ChromatogramLengthModifier.java @@ -15,6 +15,8 @@ import org.eclipse.chemclipse.model.core.IChromatogram; import org.eclipse.chemclipse.model.selection.IChromatogramSelection; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; @@ -37,7 +39,7 @@ public ChromatogramLengthModifier(IChromatogramSelection chromatogramSelection, public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { - monitor.beginTask("Chromatogram Length Modified", IProgressMonitor.UNKNOWN); + monitor.beginTask(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CHROMATOGRAM_LENGTH_MODIFIED), IProgressMonitor.UNKNOWN); IChromatogram chromatogram = chromatogramSelection.getChromatogram(); int scanRange = chromatogram.getNumberOfScans() - 1; if(scanRange > 0) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/MassSpectrumIdentifierRunnable.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/MassSpectrumIdentifierRunnable.java index fce56d8f41..0929f25234 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/MassSpectrumIdentifierRunnable.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/MassSpectrumIdentifierRunnable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2021 Lablicate GmbH. + * Copyright (c) 2017, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -16,6 +16,8 @@ import org.eclipse.chemclipse.chromatogram.msd.identifier.massspectrum.MassSpectrumIdentifier; import org.eclipse.chemclipse.msd.model.core.IScanMSD; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; @@ -34,7 +36,7 @@ public MassSpectrumIdentifierRunnable(List scans, String identifierId) public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { - monitor.beginTask("Scan Identification", IProgressMonitor.UNKNOWN); + monitor.beginTask(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SCAN_IDENTIFICATION), IProgressMonitor.UNKNOWN); MassSpectrumIdentifier.identify(scans, identifierId, monitor); } finally { monitor.done(); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/MethodImportRunnable.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/MethodImportRunnable.java index 5a6eabc1bb..aae79a2ce6 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/MethodImportRunnable.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/MethodImportRunnable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2019 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -19,6 +19,8 @@ import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.processing.core.IProcessingInfo; import org.eclipse.chemclipse.processing.methods.IProcessMethod; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; @@ -43,7 +45,7 @@ public IProcessMethod getProcessMethod() { public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { - monitor.beginTask("Import Process Method", IProgressMonitor.UNKNOWN); + monitor.beginTask(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.IMPORT_PROCESS_METHOD), IProgressMonitor.UNKNOWN); IProcessingInfo processingInfo = MethodConverter.convert(file, monitor); processMethod = processingInfo.getProcessingResult(); } catch(Exception e) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/PCRExportRunnable.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/PCRExportRunnable.java index 680bfbfa2c..7976320ae1 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/PCRExportRunnable.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/PCRExportRunnable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -19,6 +19,8 @@ import org.eclipse.chemclipse.pcr.model.core.IPlate; import org.eclipse.chemclipse.processing.converter.ISupplier; import org.eclipse.chemclipse.processing.core.IProcessingInfo; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; @@ -47,7 +49,7 @@ public File getData() { public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { - monitor.beginTask("Export Plate", IProgressMonitor.UNKNOWN); + monitor.beginTask(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.EXPORT_PLATE), IProgressMonitor.UNKNOWN); IProcessingInfo processingInfo = PlateConverterPCR.convert(file, plate, supplier.getId(), monitor); data = (File)processingInfo.getProcessingResult(); } catch(Exception e) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/PCRImportRunnable.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/PCRImportRunnable.java index 3ce20c26cc..d27425d920 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/PCRImportRunnable.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/PCRImportRunnable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -18,6 +18,8 @@ import org.eclipse.chemclipse.pcr.converter.core.PlateConverterPCR; import org.eclipse.chemclipse.pcr.model.core.IPlate; import org.eclipse.chemclipse.processing.core.IProcessingInfo; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; @@ -42,7 +44,7 @@ public IPlate getPlate() { public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { - monitor.beginTask("Import Plate", IProgressMonitor.UNKNOWN); + monitor.beginTask(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.IMPORT_PLATE), IProgressMonitor.UNKNOWN); IProcessingInfo processingInfo = PlateConverterPCR.convert(file, monitor); plate = (IPlate)processingInfo.getProcessingResult(); } catch(Exception e) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/QuantDBImportRunnable.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/QuantDBImportRunnable.java index ac45e715fb..557b71d6b8 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/QuantDBImportRunnable.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/QuantDBImportRunnable.java @@ -19,6 +19,8 @@ import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.model.quantitation.IQuantitationDatabase; import org.eclipse.chemclipse.processing.core.IProcessingInfo; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; @@ -43,7 +45,7 @@ public IQuantitationDatabase getQuantitationDatabase() { public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { - monitor.beginTask("Import Quantitation Database", IProgressMonitor.UNKNOWN); + monitor.beginTask(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.IMPORT_QUANTITATION_DATABASE), IProgressMonitor.UNKNOWN); IProcessingInfo processingInfo = QuantDBConverter.convert(file, monitor); quantitationDatabase = processingInfo.getProcessingResult(); } catch(Exception e) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/ScanXIRImportRunnable.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/ScanXIRImportRunnable.java index a8fd034799..1af92c1a56 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/ScanXIRImportRunnable.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/ScanXIRImportRunnable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -16,6 +16,8 @@ import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.processing.core.IProcessingInfo; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.chemclipse.xir.converter.core.ScanConverterXIR; import org.eclipse.chemclipse.xir.model.core.IScanXIR; import org.eclipse.core.runtime.IProgressMonitor; @@ -42,7 +44,7 @@ public IScanXIR getScanXIR() { public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { - monitor.beginTask("Import Scan", IProgressMonitor.UNKNOWN); + monitor.beginTask(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.IMPORT_SCAN), IProgressMonitor.UNKNOWN); IProcessingInfo processingInfo = ScanConverterXIR.convert(file, monitor); scanXIR = (IScanXIR)processingInfo.getProcessingResult(); } catch(Exception e) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/SequenceFileRunnable.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/SequenceFileRunnable.java index 1b097319ec..2204cb4902 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/SequenceFileRunnable.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/SequenceFileRunnable.java @@ -25,6 +25,8 @@ import org.eclipse.chemclipse.model.types.DataType; import org.eclipse.chemclipse.ux.extension.ui.provider.ISupplierEditorSupport; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.part.support.SupplierEditorSupport; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; @@ -52,7 +54,7 @@ public List getSequenceFiles() { public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try (Stream xFiles = Files.list(Paths.get(file.toString()))) { - SubMonitor subMonitor = SubMonitor.convert(monitor, "Import Sequences", 2); + SubMonitor subMonitor = SubMonitor.convert(monitor, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.IMPORT_SEQUENCES), 2); try { subMonitor.worked(1); files = getSequenceFiles(file, new ArrayList<>(), subMonitor.split((int)xFiles.count())); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/SequenceImportRunnable.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/SequenceImportRunnable.java index 92586cbe07..e66d143e0d 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/SequenceImportRunnable.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/SequenceImportRunnable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2019 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -20,6 +20,8 @@ import org.eclipse.chemclipse.converter.sequence.SequenceConverter; import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.processing.core.IProcessingInfo; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; @@ -44,7 +46,7 @@ public ISequence getSequence() { @Override public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - SubMonitor subMonitor = SubMonitor.convert(monitor, "Read Sequence", 2); + SubMonitor subMonitor = SubMonitor.convert(monitor, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.READ_SEQUENCE), 2); try { subMonitor.worked(1); IProcessingInfo> processingInfo = SequenceConverter.convert(file, monitor); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/WaveSpectrumIdentifierRunnable.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/WaveSpectrumIdentifierRunnable.java index c03e0eb0fd..a2ffc7fbf6 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/WaveSpectrumIdentifierRunnable.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/runnables/WaveSpectrumIdentifierRunnable.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2021 Lablicate GmbH. + * Copyright (c) 2017, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -15,6 +15,8 @@ import java.util.List; import org.eclipse.chemclipse.chromatogram.wsd.identifier.wavespectrum.WaveSpectrumIdentifier; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.chemclipse.wsd.model.core.IScanWSD; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.operation.IRunnableWithProgress; @@ -34,7 +36,7 @@ public WaveSpectrumIdentifierRunnable(List scans, String identifierId) public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { try { - monitor.beginTask("Scan Identification", IProgressMonitor.UNKNOWN); + monitor.beginTask(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SCAN_IDENTIFICATION), IProgressMonitor.UNKNOWN); WaveSpectrumIdentifier.identify(scans, identifierId, monitor); } finally { monitor.done(); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/support/ChromatogramHeatmapSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/support/ChromatogramHeatmapSupport.java index 47ebfbdd4b..c8272245e6 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/support/ChromatogramHeatmapSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/support/ChromatogramHeatmapSupport.java @@ -18,6 +18,7 @@ import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.model.core.IChromatogram; +import org.eclipse.chemclipse.model.core.IChromatogramOverview; import org.eclipse.chemclipse.model.core.IScan; import org.eclipse.chemclipse.msd.model.core.IChromatogramMSD; import org.eclipse.chemclipse.msd.model.exceptions.NoExtractedIonSignalStoredException; @@ -54,12 +55,12 @@ public Optional getHeatmapData(IChromatogram chromat scaleIntensityMin = (scaleIntensityMin < 1.0d) ? 1.0d : scaleIntensityMin; scaleIntensityMax = (scaleIntensityMax < 1.0d) ? 1.0d : scaleIntensityMax; // - if(chromatogram instanceof IChromatogramMSD) { - return getHeatmap((IChromatogramMSD)chromatogram, scaleIntensityMin, scaleIntensityMax); - } else if(chromatogram instanceof IChromatogramWSD) { - return getHeatmap((IChromatogramWSD)chromatogram, scaleIntensityMin, scaleIntensityMax); - } else if(chromatogram instanceof IChromatogramTSD) { - return getHeatmap((IChromatogramTSD)chromatogram, scaleIntensityMin, scaleIntensityMax); + if(chromatogram instanceof IChromatogramMSD chromatogramMSD) { + return getHeatmap(chromatogramMSD, scaleIntensityMin, scaleIntensityMax); + } else if(chromatogram instanceof IChromatogramWSD chromatogramWSD) { + return getHeatmap(chromatogramWSD, scaleIntensityMin, scaleIntensityMax); + } else if(chromatogram instanceof IChromatogramTSD chromatogramTSD) { + return getHeatmap(chromatogramTSD, scaleIntensityMin, scaleIntensityMax); } } catch(Exception e) { logger.warn(e); @@ -85,8 +86,8 @@ private Optional getHeatmap(IChromatogramWSD chromatogr int divisor = calculateDivisor(dataWidth, dataHeight); dataHeight /= divisor; // - double startRetentionTime = chromatogram.getStartRetentionTime() / IChromatogram.MINUTE_CORRELATION_FACTOR; - double stopRetentionTime = chromatogram.getStopRetentionTime() / IChromatogram.MINUTE_CORRELATION_FACTOR; + double startRetentionTime = chromatogram.getStartRetentionTime() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR; + double stopRetentionTime = chromatogram.getStopRetentionTime() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR; // float[] heatmapData = new float[dataHeight * dataWidth * 2]; int j = 0; @@ -142,8 +143,8 @@ private Optional getHeatmap(IChromatogramMSD chromatogr int divisor = calculateDivisor(dataHeight, dataWidth); dataWidth /= divisor; // - double startRetentionTime = chromatogram.getStartRetentionTime() / IChromatogram.MINUTE_CORRELATION_FACTOR; - double stopRetentionTime = chromatogram.getStopRetentionTime() / IChromatogram.MINUTE_CORRELATION_FACTOR; + double startRetentionTime = chromatogram.getStartRetentionTime() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR; + double stopRetentionTime = chromatogram.getStopRetentionTime() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR; /* * The data height and width must be >= 1! */ @@ -215,8 +216,8 @@ private Optional getHeatmapType1(IChromatogramTSD chrom int divisor = calculateDivisor(dataWidth, dataHeight); dataHeight /= divisor; // - double startRetentionTime = chromatogram.getStartRetentionTime() / IChromatogram.MINUTE_CORRELATION_FACTOR; - double stopRetentionTime = chromatogram.getStopRetentionTime() / IChromatogram.MINUTE_CORRELATION_FACTOR; + double startRetentionTime = chromatogram.getStartRetentionTime() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR; + double stopRetentionTime = chromatogram.getStopRetentionTime() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR; /* * The data height and width must be >= 1! */ @@ -284,8 +285,8 @@ private Optional getHeatmapType2(IChromatogramTSD chrom int divisor = calculateDivisor(dataWidth, dataHeight); dataHeight /= divisor; // - double startRetentionTime = chromatogram.getStartRetentionTime() / IChromatogram.MINUTE_CORRELATION_FACTOR; - double stopRetentionTime = chromatogram.getStopRetentionTime() / IChromatogram.MINUTE_CORRELATION_FACTOR; + double startRetentionTime = chromatogram.getStartRetentionTime() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR; + double stopRetentionTime = chromatogram.getStopRetentionTime() / IChromatogramOverview.MINUTE_CORRELATION_FACTOR; /* * The data height and width must be >= 1! */ @@ -343,8 +344,8 @@ private List getScansTSD(List scans) { List scansTSD = new ArrayList<>(); for(IScan scan : scans) { - if(scan instanceof IScanTSD) { - scansTSD.add((IScanTSD)scan); + if(scan instanceof IScanTSD scanTSD) { + scansTSD.add(scanTSD); } } // diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/support/ManualPeakDetector.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/support/ManualPeakDetector.java index f9495e3ebe..249a53d474 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/support/ManualPeakDetector.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/support/ManualPeakDetector.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2018 Lablicate GmbH. + * Copyright (c) 2008, 2022 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -29,6 +29,7 @@ public class ManualPeakDetector { private static final String DETECTOR_DESCRIPTION = "Manual"; + private static final String CHROMATOGRAM_MUST_NOT_BE_NULL = "The chromatogram instance must be not null."; /** * Returns a peak calculated by the given values. @@ -38,7 +39,7 @@ public class ManualPeakDetector { public IChromatogramPeakMSD calculatePeak(IChromatogramMSD chromatogram, int startRetentionTime, int stopRetentionTime, float startAbundance, float stopAbundance) throws PeakException { if(chromatogram == null) { - throw new PeakException("The chromatogram instance must be not null."); + throw new PeakException(CHROMATOGRAM_MUST_NOT_BE_NULL); } /* * Create the peak. @@ -60,7 +61,7 @@ public IChromatogramPeakMSD calculatePeak(IChromatogramMSD chromatogram, int sta public IChromatogramPeakCSD calculatePeak(IChromatogramCSD chromatogram, int startRetentionTime, int stopRetentionTime, float startAbundance, float stopAbundance) throws PeakException { if(chromatogram == null) { - throw new PeakException("The chromatogram instance must be not null."); + throw new PeakException(CHROMATOGRAM_MUST_NOT_BE_NULL); } /* * Create the peak. @@ -82,7 +83,7 @@ public IChromatogramPeakCSD calculatePeak(IChromatogramCSD chromatogram, int sta public IChromatogramPeakWSD calculatePeak(IChromatogramWSD chromatogram, int startRetentionTime, int stopRetentionTime, float startAbundance, float stopAbundance) throws PeakException { if(chromatogram == null) { - throw new PeakException("The chromatogram instance must be not null."); + throw new PeakException(CHROMATOGRAM_MUST_NOT_BE_NULL); } /* * Create the peak. diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/support/TableConfigSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/support/TableConfigSupport.java index 448fe70358..48c29e7598 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/support/TableConfigSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/support/TableConfigSupport.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019 Lablicate GmbH. + * Copyright (c) 2019, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -29,10 +29,12 @@ public class TableConfigSupport implements TableConfig { private Supplier> columns; public TableConfigSupport(Collection columns) { + this((Supplier>)() -> columns); } public TableConfigSupport(Supplier> columns) { + this.columns = columns; } @@ -53,21 +55,19 @@ private void restoreItem(Item item) { Object oldWidth = item.getData("OLD_WIDTH"); Object oldResizable = item.getData("OLD_RESIZABLE"); - if(item instanceof TreeColumn) { - TreeColumn column = (TreeColumn)item; - if(oldWidth instanceof Number) { - column.setWidth(((Number)oldWidth).intValue()); + if(item instanceof TreeColumn column) { + if(oldWidth instanceof Number oldWidthNumber) { + column.setWidth(oldWidthNumber.intValue()); } - if(oldResizable instanceof Boolean) { - column.setResizable(((Boolean)oldResizable).booleanValue()); + if(oldResizable instanceof Boolean oldResizableBoolean) { + column.setResizable(oldResizableBoolean.booleanValue()); } - } else if(item instanceof TableColumn) { - TableColumn column = (TableColumn)item; - if(oldWidth instanceof Number) { - column.setWidth(((Number)oldWidth).intValue()); + } else if(item instanceof TableColumn column) { + if(oldWidth instanceof Number oldWidthNumber) { + column.setWidth(oldWidthNumber.intValue()); } - if(oldResizable instanceof Boolean) { - column.setResizable(((Boolean)oldResizable).booleanValue()); + if(oldResizable instanceof Boolean oldResizableBoolean) { + column.setResizable(oldResizableBoolean.booleanValue()); } } } @@ -87,14 +87,12 @@ public Set getColumns() { private void hideItem(Item item) { - if(item instanceof TreeColumn) { - TreeColumn column = (TreeColumn)item; + if(item instanceof TreeColumn column) { item.setData("OLD_WIDTH", column.getWidth()); item.setData("OLD_RESIZABLE", column.getResizable()); column.setWidth(0); column.setResizable(false); - } else if(item instanceof TableColumn) { - TableColumn column = (TableColumn)item; + } else if(item instanceof TableColumn column) { item.setData("OLD_WIDTH", column.getWidth()); item.setData("OLD_RESIZABLE", column.getResizable()); column.setWidth(0); @@ -104,10 +102,10 @@ private void hideItem(Item item) { private Item getItem(ViewerColumn column) { - if(column instanceof TreeViewerColumn) { - return ((TreeViewerColumn)column).getColumn(); - } else if(column instanceof TableViewerColumn) { - return ((TableViewerColumn)column).getColumn(); + if(column instanceof TreeViewerColumn treeViewerColumn) { + return treeViewerColumn.getColumn(); + } else if(column instanceof TableViewerColumn tableViewerColumn) { + return tableViewerColumn.getColumn(); } return null; } @@ -118,10 +116,10 @@ public int getColumWidth(String columnName) { for(ViewerColumn column : columns.get()) { Item item = getItem(column); if(item != null && item.getText().equals(columnName)) { - if(item instanceof TreeColumn) { - return ((TreeColumn)item).getWidth(); - } else if(item instanceof TableColumn) { - return ((TableColumn)item).getWidth(); + if(item instanceof TreeColumn treeColumn) { + return treeColumn.getWidth(); + } else if(item instanceof TableColumn tableColumn) { + return tableColumn.getWidth(); } } } @@ -134,11 +132,11 @@ public void setColumWidth(String columnName, int width) { for(ViewerColumn column : columns.get()) { Item item = getItem(column); if(item != null && item.getText().equals(columnName)) { - if(item instanceof TreeColumn) { - ((TreeColumn)item).setWidth(width); + if(item instanceof TreeColumn treeColumn) { + treeColumn.setWidth(width); return; - } else if(item instanceof TableColumn) { - ((TableColumn)item).setWidth(width); + } else if(item instanceof TableColumn tableColumn) { + tableColumn.setWidth(width); return; } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/CalibrationNameValidator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/CalibrationNameValidator.java index 28a732242e..b09836de20 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/CalibrationNameValidator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/CalibrationNameValidator.java @@ -11,13 +11,15 @@ *******************************************************************************/ package org.eclipse.chemclipse.ux.extension.xxd.ui.internal.validation; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.databinding.validation.IValidator; import org.eclipse.core.databinding.validation.ValidationStatus; import org.eclipse.core.runtime.IStatus; public class CalibrationNameValidator implements IValidator { - private static final String ERROR = "Please enter a calibration index name, e.g. Hexane."; + private static final String ERROR = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.ENTER_CALIBRATION_INDEX_NAME); // private String name = ""; @@ -30,8 +32,8 @@ public IStatus validate(Object value) { if(value == null) { message = ERROR; } else { - if(value instanceof String) { - String text = ((String)value).trim(); + if(value instanceof String text) { + text = text.trim(); if(text.length() < 1) { message = ERROR; } else { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/NameValidator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/NameValidator.java index e194fb6df2..80435cdc50 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/NameValidator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/NameValidator.java @@ -11,13 +11,15 @@ *******************************************************************************/ package org.eclipse.chemclipse.ux.extension.xxd.ui.internal.validation; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.databinding.validation.IValidator; import org.eclipse.core.databinding.validation.ValidationStatus; import org.eclipse.core.runtime.IStatus; public class NameValidator implements IValidator { - private static final String ERROR = "Please enter a correct name."; + private static final String ERROR = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.ENTER_CORRECT_NAME); // private String name = ""; @@ -30,8 +32,8 @@ public IStatus validate(Object value) { if(value == null) { message = ERROR; } else { - if(value instanceof String) { - String text = ((String)value).trim(); + if(value instanceof String text) { + text = text.trim(); if(text.length() < 1) { message = ERROR; } else { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/NamedTraceInputValidator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/NamedTraceInputValidator.java index 2dc7208b95..26aa7625e7 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/NamedTraceInputValidator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/NamedTraceInputValidator.java @@ -14,6 +14,8 @@ import java.util.HashSet; import java.util.Set; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.traces.NamedTraceValidator; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.IInputValidator; @@ -24,6 +26,7 @@ public class NamedTraceInputValidator implements IInputValidator { private Set identifier = new HashSet<>(); public NamedTraceInputValidator(Set identifier) { + if(identifier != null) { this.identifier = identifier; } @@ -36,7 +39,7 @@ public String isValid(String target) { if(status.isOK()) { String name = validator.getIdentifier(); if(identifier.contains(name)) { - return "The named trace already exists."; + return ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NAMED_TRACE_ALREADY_EXISTS); } } else { return status.getMessage(); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/QuantInputValidator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/QuantInputValidator.java index 3fdcd2ba1e..4cf27946cd 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/QuantInputValidator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/QuantInputValidator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -13,10 +13,8 @@ import org.eclipse.jface.dialogs.IInputValidator; -// TODO Is this class used? public class QuantInputValidator implements IInputValidator { - @SuppressWarnings("unused") private String[] items = new String[]{}; public QuantInputValidator(String[] list) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/QuantitationCompoundValidator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/QuantitationCompoundValidator.java index f2d4052adc..6686b314fd 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/QuantitationCompoundValidator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/QuantitationCompoundValidator.java @@ -11,9 +11,11 @@ *******************************************************************************/ package org.eclipse.chemclipse.ux.extension.xxd.ui.internal.validation; -import org.eclipse.chemclipse.model.core.AbstractChromatogram; +import org.eclipse.chemclipse.model.core.IChromatogramOverview; import org.eclipse.chemclipse.model.quantitation.IQuantitationCompound; import org.eclipse.chemclipse.support.util.ValueParserSupport; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.chemclipse.xxd.model.quantitation.QuantitationCompound; import org.eclipse.core.databinding.validation.IValidator; import org.eclipse.core.databinding.validation.ValidationStatus; @@ -24,7 +26,7 @@ public class QuantitationCompoundValidator extends ValueParserSupport implements public static final String DEMO = "Styrene | mg/kg | 5.68"; // private static final String DELIMITER = "|"; - private static final String ERROR_TARGET = "Please enter a compound, e.g.: " + DEMO; + private static final String ERROR_TARGET = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.ENTER_COMPOUND_EXAMPLE) + ": " + DEMO; // private String name; private String concentrationUnit; @@ -37,8 +39,8 @@ public IStatus validate(Object value) { if(value == null) { message = ERROR_TARGET; } else { - if(value instanceof String) { - String text = ((String)value).trim(); + if(value instanceof String text) { + text = text.trim(); if("".equals(text.trim())) { message = ERROR_TARGET; } else { @@ -46,7 +48,7 @@ public IStatus validate(Object value) { // name = parseString(values, 0); concentrationUnit = parseString(values, 1); - retentionTime = (int)(parseDouble(values, 2, 0.0d) * AbstractChromatogram.MINUTE_CORRELATION_FACTOR); + retentionTime = (int)(parseDouble(values, 2, 0.0d) * IChromatogramOverview.MINUTE_CORRELATION_FACTOR); } } else { message = ERROR_TARGET; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/QuantitationSignalValidator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/QuantitationSignalValidator.java index 29f8cfea7b..a389bd4f7b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/QuantitationSignalValidator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/QuantitationSignalValidator.java @@ -15,6 +15,8 @@ import org.eclipse.chemclipse.model.quantitation.IQuantitationSignal; import org.eclipse.chemclipse.model.quantitation.QuantitationSignal; import org.eclipse.chemclipse.support.util.ValueParserSupport; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.databinding.validation.IValidator; import org.eclipse.core.databinding.validation.ValidationStatus; import org.eclipse.core.runtime.IStatus; @@ -24,7 +26,7 @@ public class QuantitationSignalValidator extends ValueParserSupport implements I public static final String DEMO = "TIC | 100.0 | 0.0 | true"; // private static final String DELIMITER = "|"; - private static final String ERROR_TARGET = "Please enter a signal, e.g.: " + DEMO; + private static final String ERROR_TARGET = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.ENTER_SIGNAL_EXAMPLE) + ": " + DEMO; // private double signal; private float relativeResponse; @@ -38,8 +40,8 @@ public IStatus validate(Object value) { if(value == null) { message = ERROR_TARGET; } else { - if(value instanceof String) { - String text = ((String)value).trim(); + if(value instanceof String text) { + text = text.trim(); if("".equals(text.trim())) { message = ERROR_TARGET; } else { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/ResponseFactorValidator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/ResponseFactorValidator.java index 26db7f170e..0b8bd6e03f 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/ResponseFactorValidator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/ResponseFactorValidator.java @@ -11,14 +11,16 @@ *******************************************************************************/ package org.eclipse.chemclipse.ux.extension.xxd.ui.internal.validation; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.databinding.validation.IValidator; import org.eclipse.core.databinding.validation.ValidationStatus; import org.eclipse.core.runtime.IStatus; public class ResponseFactorValidator implements IValidator { - private static final String ERROR = "Please enter a correct response factor."; - private static final String ERROR_VALUE_RANGE = "The response factor must be not <= 0."; + private static final String ERROR = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.ENTER_CORRECT_RESPONSE_FACTOR); + private static final String ERROR_VALUE_RANGE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RESPONSE_FACTOR_MUST_NOT_BE_NEGATIVE); // private double responseFactor = 0.0d; @@ -31,8 +33,8 @@ public IStatus validate(Object value) { if(value == null) { message = ERROR; } else { - if(value instanceof String) { - String text = ((String)value).trim(); + if(value instanceof String text) { + text = text.trim(); try { double responseFactor = Double.parseDouble(text); if(responseFactor <= 0.0d) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/ResponseSignalValidator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/ResponseSignalValidator.java index 7dea40d072..76f1ef2b1a 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/ResponseSignalValidator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/ResponseSignalValidator.java @@ -15,6 +15,8 @@ import org.eclipse.chemclipse.model.quantitation.IResponseSignal; import org.eclipse.chemclipse.model.quantitation.ResponseSignal; import org.eclipse.chemclipse.support.util.ValueParserSupport; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.databinding.validation.IValidator; import org.eclipse.core.databinding.validation.ValidationStatus; import org.eclipse.core.runtime.IStatus; @@ -24,7 +26,7 @@ public class ResponseSignalValidator extends ValueParserSupport implements IVali public static final String DEMO = "TIC | 1.5 | 289893.38"; // private static final String DELIMITER = "|"; - private static final String ERROR_TARGET = "Please enter a response signal, e.g.: " + DEMO; + private static final String ERROR_TARGET = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.ENTER_RESPONSE_SIGNAL_EXAMPLE) + DEMO; // private double signal; private double concentration; @@ -37,8 +39,8 @@ public IStatus validate(Object value) { if(value == null) { message = ERROR_TARGET; } else { - if(value instanceof String) { - String text = ((String)value).trim(); + if(value instanceof String text) { + text = text.trim(); if("".equals(text.trim())) { message = ERROR_TARGET; } else { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/RetentionIndexValidator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/RetentionIndexValidator.java index 4b9784b943..d40614b225 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/RetentionIndexValidator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/RetentionIndexValidator.java @@ -11,14 +11,16 @@ *******************************************************************************/ package org.eclipse.chemclipse.ux.extension.xxd.ui.internal.validation; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.databinding.validation.IValidator; import org.eclipse.core.databinding.validation.ValidationStatus; import org.eclipse.core.runtime.IStatus; public class RetentionIndexValidator implements IValidator { - private static final String ERROR = "Please enter a correct retention index, e.g. 600"; - private static final String ERROR_VALUE_RANGE = "The retention index must be not <= 0."; + private static final String ERROR = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.ENTER_CORRECT_RETENTION_INDEX_EXAMPLE) + " 600"; + private static final String ERROR_VALUE_RANGE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RETENTION_INDEX_MUST_NOT_BE_NEGATIVE); // private float retentionIndex = 0.0f; @@ -31,9 +33,9 @@ public IStatus validate(Object value) { if(value == null) { message = ERROR; } else { - if(value instanceof String) { + if(value instanceof String text) { try { - float retentionIndex = Float.parseFloat(((String)value).trim()); + float retentionIndex = Float.parseFloat(text.trim()); if(retentionIndex <= 0.0d) { message = ERROR_VALUE_RANGE; } else { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/RetentionTimeValidator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/RetentionTimeValidator.java index 727920ba8a..1fccc6f7cc 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/RetentionTimeValidator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/RetentionTimeValidator.java @@ -11,14 +11,16 @@ *******************************************************************************/ package org.eclipse.chemclipse.ux.extension.xxd.ui.internal.validation; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.databinding.validation.IValidator; import org.eclipse.core.databinding.validation.ValidationStatus; import org.eclipse.core.runtime.IStatus; public class RetentionTimeValidator implements IValidator { - private static final String ERROR = "Please enter a correct retention time in minutes, e.g. 4.25"; - private static final String ERROR_VALUE_RANGE = "The retention time must be not <= 0."; + private static final String ERROR = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.ENTER_CORRECT_RETION_TIME_MINUTES_EXAMPLE) + " 4.25"; + private static final String ERROR_VALUE_RANGE = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RETENTION_TIME_MUST_NOT_BE_NEGATIVE); // private double retentionTime = 0.0d; @@ -31,9 +33,9 @@ public IStatus validate(Object value) { if(value == null) { message = ERROR; } else { - if(value instanceof String) { + if(value instanceof String text) { try { - double retentionTime = Double.parseDouble(((String)value).trim()); + double retentionTime = Double.parseDouble(text.trim()); if(retentionTime <= 0.0d) { message = ERROR_VALUE_RANGE; } else { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/ShiftValidator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/ShiftValidator.java index d66439005a..0446afeb57 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/ShiftValidator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/ShiftValidator.java @@ -11,13 +11,15 @@ *******************************************************************************/ package org.eclipse.chemclipse.ux.extension.xxd.ui.internal.validation; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.databinding.validation.IValidator; import org.eclipse.core.databinding.validation.ValidationStatus; import org.eclipse.core.runtime.IStatus; public class ShiftValidator implements IValidator { - private static final String ERROR = "Please enter a valid number."; + private static final String ERROR = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.ENTER_VALID_NUMBER); private double shift = 0.0d; @Override @@ -27,9 +29,9 @@ public IStatus validate(Object value) { boolean parseError = true; // if(value != null) { - if(value instanceof String) { + if(value instanceof String text) { try { - shift = Double.parseDouble(((String)value).trim()); + shift = Double.parseDouble(text.trim()); parseError = false; } catch(NumberFormatException e) { // Don't catch it here. diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/TargetTemplateInputValidator.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/TargetTemplateInputValidator.java index e3df834b62..cfc0ce20cb 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/TargetTemplateInputValidator.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/internal/validation/TargetTemplateInputValidator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2020 Lablicate GmbH. + * Copyright (c) 2017, 2022 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -15,6 +15,8 @@ import java.util.Set; import org.eclipse.chemclipse.model.targets.TargetValidator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.IInputValidator; @@ -37,7 +39,7 @@ public String isValid(String target) { if(status.isOK()) { String name = targetValidator.getName(); if(names.contains(name)) { - return "The target templates already exists."; + return ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TARGET_TEMPLATE_ALREADY_EXISTS); } } else { return status.getMessage(); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/messages/ExtensionMessages.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/messages/ExtensionMessages.java new file mode 100644 index 0000000000..aab7da756e --- /dev/null +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/messages/ExtensionMessages.java @@ -0,0 +1,33 @@ +/******************************************************************************* + * Copyright (c) 2015, 2022 Lablicate GmbH. + * + * 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: + * Dr. Philip Wenig - initial API and implementation + *******************************************************************************/ +package org.eclipse.chemclipse.ux.extension.xxd.ui.messages; + +import org.eclipse.chemclipse.support.l10n.Messages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; + +public class ExtensionMessages implements IExtensionMessages { + + private static Messages messages; + + /** + * Returns the messages instance to get a translation. + * + * @return {@link Messages} + */ + public static Messages INSTANCE() { + + if(messages == null) { + messages = new Messages(Activator.getContext().getBundle()); + } + return messages; + } +} diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/messages/IExtensionMessages.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/messages/IExtensionMessages.java new file mode 100644 index 0000000000..7fc98611e8 --- /dev/null +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/messages/IExtensionMessages.java @@ -0,0 +1,303 @@ +/******************************************************************************* + * Copyright (c) 2022 Lablicate GmbH. + * + * 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: + * Matthias Mailänder - initial API and implementation + *******************************************************************************/ +package org.eclipse.chemclipse.ux.extension.xxd.ui.messages; + +public interface IExtensionMessages { + + /* + * The strings need to be listed and translated in: + * OSGI-INF/l10n/bundle.properties ... + */ + String DATA_EXPLORER = "DataExplorer"; + String PROCESSING_FAILED = "ProcessingFailed"; + String TOGGLE_CHART_GRID = "ToggleChartGrid"; + String CANT_PROCESS_SETTINGS = "CantProcessSettings"; + String MANAGE_LABEL_CHROMATOGRAM = "ManageLabelsChromatogram"; + String DATA_ANALYSIS = "DataAnalysis"; + String SET_RETENTION_TIME_MINUTES = "SetRetentionTimeMinutes"; + String SET_RETENTION_INDEX = "SetRetentionIndex"; + String TOGGLE_INFO_TOOLBAR = "ToggleInfoToolbar"; + String SELECT_CHROMATOGRAM_COLUMN = "SelectChromatogramColumn"; + String TOGGLE_SEARCH_TOOLBAR = "ToggleSearchToolbar"; + String TOGGLE_MODIFY_TOOLBAR = "ToggleModifyToolbar"; + String TOGGLE_EDIT_TOOLBAR = "ToggleEditToolbar"; + String ADD_LIBRARY_TO_SEARCH = "AddLibraryToSearch"; + String RETENTION_INDEX_CALCULATOR = "RetentionIndexCalculator"; + String RETENTION_INDEX_LIBRARY_ADDED = "RetentionIndexLibraryAdded"; + String RETENTION_INDEX_LIBRARY_REMOVED = "RetentionIndexLibraryRemoved"; + String REMOVE_LIBRARY_FROM_SEARCH = "RemoveLibraryFromSearch"; + String EDIT_ENABLED = "EditEnabled"; + String EDIT_DISABLED = "EditDisabled"; + String DELETE_REFERENCES = "DeleteReferences"; + String SHALL_DELETE_REFERENCES = "ShallDeleteReferences"; + String CHROMATOGRAM_EDITOR = "ChromatogramEditor"; + String SAVE_CHROMATOGRAM = "SaveChromatogram"; + String CHROMATOGRAM = "Chromatogram"; + String CHROMATOGRAM_FROM_PROJECT_EXPLORER = "ChromatogramFromProjectExplorer"; + String QUANTITATION_EDITOR_TSD = "ChromatogramEditorTSD"; + String QUANTITATION_EDITOR = "Quantitation Editor"; + String NMR_EDITOR = "EditorNMR"; + String XIR_EDITOR = "EditorXIR"; + String SEQUENCE_EDITOR = "SequenceEditor"; + String ADJUST_CHROMATOGRAM_EDITOR = "AdjustChromatogramEditor"; + String CHROMATOGRAM_EDITOR_RESET = "ChromatogramEditorReset"; + String SELECT_FILES_TO_BE_OPENED = "SelectFilesToBeOpened"; + String CHOOSE_DESIRED_CATEGORIES_TO_CREATE_NEW_METHOD = "ChooseDesiredCategoriesToCreateNewMethod"; + String PROCESS_METHOD = "ProcessMethod"; + String INSTRUMENTS = "Instruments"; + String INSTRUMENT = "Instrument"; + String CREATE_NEW_INSTRUMENT = "CreateNewInstrument"; + String EDIT_SELECTED_INSTRUMENT = "EditSelectedInstrument"; + String REMOVE_SELECTED_INSTRUMENT = "RemoveSelectedInstrument"; + String REALLY_DELETE_SELECTED_INSTRUMENT = "ReallyDeleteSelectedInstrument"; + String REMOVE_ALL_INSTRUMENTS = "RemoveAllInstruments"; + String REALLY_REMOVE_ALL_INSTRUMENTS = "ReallyDeleteAllInstrument"; + String IMPORT_INSTRUMENT_LIST = "ImportInstrumentList"; + String INSTRUMENT_LIST = "InstrumentList"; + String EXPORT_INSTRUMENT_LIST = "ExportInstrumentList"; + String INSTRUMENT_LIST_EXPORTED = "InstrumentListExported"; + String INSTRUMENT_LIST_EXPORT_FAILED = "InstrumentListExportFailed"; + String SAVE_INSTRUMENT_LIST = "SaveInstrumentList"; + String REALLY_SAVE_IDENTIFICATIONS = "ReallySaveIdentifications"; + String REDO_OPERATION_FAILED = "RedoOperationFailed"; + String REDO_OPERATION_FINISHED = "RedoOperationFinished"; + String UNDO_OPERATION_FAILED = "UndoOperationFailed"; + String UNDO_OPERATION_FINISHED = "UndoOperationFinished"; + String NAME = "Name"; + String VALUE = "Value"; + String FIELD_FOR_COLOR_CODE_NAME = "FieldForColorCodeName"; + String COLOR_IS_USED = "ColorIsUsed"; + String SELECT_COLOR = "SelectColor"; + String NAME_MUST_BE_SPECIFIED = "NameMustBeSpecified"; + String NAME_MUST_NOT_CONTAIN = "NameMustNotContain"; + String COLOR = "Color"; + String IDENTIFIER = "Identifier"; + String DESCRIPTION = "Description"; + String AREA = "Area"; + String TRACE = "Trace"; + String CONCENTRATION = "Concentration"; + String UNIT = "Unit"; + String RESPONSE_FACTOR = "ResponseFactor"; + String CHEMICAL_CLASS = "ChemicalClass"; + String TYPE = "Type"; + String SETTINGS = "Settings"; + String ID = "ID"; + String PROCESSOR_NOT_AVAILABLE = "ProcessorNotAvailable"; + String PREFERENCES_SUPPLIER_NOT_AVAILABLE = "PreferenceSupplierNotAvailable"; + String PROCESS_TYPE_SUPPORT_NOT_AVAILABLE = "ProcessTypeSupportNotAvailable"; + String PROCESSOR_SKIP_VALIDATION_OPTIOIN_SET = "ProcessorSkipValidationOptionSet"; + String PROCESSOR_PREFERENCES_NOT_AVAILABLE = "ProcessorPreferencesNotAvailable"; + String PROCESSOR_HAS_NO_SETTINGS_CLASS = "ProcessorHasNoSettingsClass"; + String PROCESSOR_USES_SYSTEM_DEFAULT_SETTINGS = "ProcessorUsesSystemDefaultSettings"; + String PROCESSOR_SETTINGS_CANNOT_BE_PARSED = "ProcessorSettingsCannotBetParsed"; + String TRACES = "Traces"; + String BEST_TARGET = "BestTarget"; + String ACTIVE_FOR_ANALYSIS = "ActiveForAnalysis"; + String RT_MIN = "RTmin"; + String RRT_MIN = "RRTmin"; + String RI = "RI"; + String AREA_TOTAL = "AreaTotal"; + String START_RETENTION_TIME = "StartRetentionTime"; + String STOP_RETENTION_TIME = "StopRetentionTime"; + String WIDTH = "Width"; + String SCAN_NUMBER_AT_PEAK_MAX = "ScanNumberAtPeakMax"; + String SIGNAL_TO_NOISE = "SignalToNoise"; + String LEADING = "Leading"; + String TAILING = "Tailing"; + String MODEL_DESCRIPTION = "ModelDescription"; + String DETECTOR = "Detector"; + String INTEGRATOR = "Integrator"; + String SUGGESTED_COMPONENTS = "SuggestedComponents"; + String AREA_PERCENT = "AreaPercent"; + String QUANTIFIER = "Quantifier"; + String CLASSIFIER = "Classifier"; + String CONCENTRATION_UNIT = "ConcentrationUnit"; + String CALIBRATION_METHOD = "CalibrationMethod"; + String CROSS_ZERO = "CrossZero"; + String USE_TIC = "UseTic"; + String RETENTION_TIME = "RetentionTime"; + String RETENTION_TIME_LOWER = "RetentionTimeLower"; + String RETENTION_TIME_UPPER = "RetentionTimeUpper"; + String RETENTION_INDEX_RI = "RetentionIndexRI"; + String RETENTION_INDEX_LOWER = "RetentionIndexLower"; + String RETENTION_INDEX_UPPER = "RetentionIndexUpper"; + String FLAG = "Flag"; + String SIGNAL = "Signal"; + String RESPONSE = "Response"; + String RELATIVE_RESPONSE = "RelativeResponse"; + String UNCERTAINTY = "Uncertainty"; + String USE = "Use"; + String RETENTION_TIME_MINUTES = "RetentionTimeMinutes"; + String RETENTION_INDEX = "RetentionIndex"; + String EMPTY_CAPS = "EmptyCaps"; + String SIM = "SIM"; + String SCAN_CAPS = "ScanCaps"; + String SCAN_HASH = "ScanHash"; + String TIME_MIN = "TimeMin"; + String COUNT_IONS = "CountIons"; + String SIM_SCAN = "SimScan"; + String SIZE_KB = "SizeKB"; + String SAMPLE_NAME = "SampleName"; + String DATA_PATH = "DataPath"; + String DATA_FILE = "DataFile"; + String ADVICE = "Advice"; + String VIAL = "Vial"; + String SUBSTANCE = "Substance"; + String MULTIPLIER = "Multiplier"; + String INJECTION_VOLUME = "InjectionVolume"; + String REPORT_METHOD = "ReportMethod"; + String SYNONYM = "Synonym"; + String VISIBLE = "Visible"; + String LIBRARY_FIELD = "LibraryField"; + String VERIFIED_MANUALLY = "VerifiedManually"; + String MATCH_FACTOR = "MatchFactor"; + String REVERSE_MATCH_FACTOR = "ReverseMatchFactor"; + String MATCH_FACTOR_DIRECT = "MatchFactorDirect"; + String REVERSE_MATCH_FACTOR_DIRECT = "ReverseMatchFactorDirect"; + String PROBABILITY = "Probability"; + String MOL_WEIGHT = "MolWeight"; + String EXACT_MASS = "ExcactMass"; + String MISCELLANEOUS = "Miscellaneous"; + String DATABASE = "Database"; + String DATABASE_INDEX = "DatabaseIndex"; + String RATING = "Rating"; + String COMMENTS = "Comments"; + String FORMULA = "Formula"; + String CONTRIBUTOR = "Contributor"; + String REFERENCE_ID = "ReferenceID"; + String TARGET_HAS_BEEN_EDITED = "TargetHasBeenEdited"; + String START_TIME_MIN = "StartTimeMin"; + String CENTER_TIME_MIN = "CenterTimeMin"; + String STOP_TIME_MIN = "StopTimeMin"; + String CHROMATOGRAM_LENGTH_MODIFIED = "ChromatogramLengthModified"; + String SCAN_IDENTIFICATION = "ScanIdentification"; + String IMPORT_PROCESS_METHOD = "ImportProcessMethod"; + String EXPORT_PLATE = "ExportPlate"; + String IMPORT_PLATE = "ImportPlate"; + String IMPORT_QUANTITATION_DATABASE = "ImportQuantitationDatabase"; + String IMPORT_SCAN = "ImportScan"; + String IMPORT_SEQUENCES = "ImportSequences"; + String READ_SEQUENCE = "ReadSequence"; + String ENTER_CALIBRATION_INDEX_NAME = "EnterCalibrationIndexName"; + String NAMED_TRACE_ALREADY_EXISTS = "NamedTraceAlreadyExists"; + String ENTER_CORRECT_NAME = "EnterCorrectName"; + String ENTER_COMPOUND_EXAMPLE = "EnterCompoundExample"; + String ENTER_SIGNAL_EXAMPLE = "EnterSignalExample"; + String ENTER_CORRECT_RESPONSE_FACTOR = "EnterCorrectResponseFactor"; + String RESPONSE_FACTOR_MUST_NOT_BE_NEGATIVE = "ResponseFactorMustNotBeNegative"; + String ENTER_RESPONSE_SIGNAL_EXAMPLE = "EnterResponseSignalExample"; + String ENTER_CORRECT_RETENTION_INDEX_EXAMPLE = "EnterCorrectRetentionIndexExample"; + String RETENTION_INDEX_MUST_NOT_BE_NEGATIVE = "RetentionIndexMustNotBeNegative"; + String ENTER_CORRECT_RETION_TIME_MINUTES_EXAMPLE = "EnterCorrectRetentionTimeMinutesExample"; + String RETENTION_TIME_MUST_NOT_BE_NEGATIVE = "RetentionTimeMustNotBeNegative"; + String ENTER_VALID_NUMBER = "EnterValidNumber"; + String TARGET_TEMPLATE_ALREADY_EXISTS = "TargetTemplateAlreadyExists"; + String PROCESS_METHOD_FILENAME = "ProcessMethodFilename"; + String SAVE_PROCESS_METHOD_AS = "SaveProcessMethodAs"; + String REQUESTED_CONVERTER_DOES_NOT_EXIST = "RequestedConverterDoesNotExist"; + String REPORT_EXPORT = "ReportExport"; + String CHROMATOGRAM_EXPORT = "ChromatogramExport"; + String METHOD_EDITOR = "MethodEditor"; + String SELECT_METHODS_DIRECTORY = "SelectMethodsDirectory"; + String EDIT_SELECTED_METHOD = "EditSelectedMethod"; + String EDIT_METHOD = "EditMethod"; + String COPY_METHOD = "CopyMethod"; + String CANT_COPY_METHOD_CONTAINER = "CantCopyMethodContainer"; + String SHALL_COPY_METHOD = "ShallCopyMethod"; + String CANT_COPY_METHOD_FILESYSTEM = "CantCopyMethodFilesystem"; + String DELETE_SELECTED_METHOD = "DeleteSelectedMethod"; + String DELETE_METHOD = "DeleteMethod"; + String CANT_DELETE_METHOD_READONLY = "CantDeleteMethodReadonly"; + String SHALL_DELETE_METHOD = "ShallDeleteMethod"; + String CANT_DELETE_METHOD_FILESYSTEM = "CantDeleteMethodFilesystem"; + String APPLY_METHOD_SELECTED_CHROMATOGRAM = "ApplyMethodSelectedChromatogram"; + String SELECT_METHOD_DIRECTORY = "SelectMethodDirectory"; + String METHOD_DIRECTORY = "MethodDirectory"; + String PROCESS_METHOD_FAILED_SEE_FEEDBACK = "ProcessMethodFailedSeeFeedback"; + String PROCESS_METHOD_EXECUTION_CANCELED = "ProcessMethodExecutionCanceled"; + String PROCESS_ENTRY = "ProcessEntry"; + String SELECT_PROCESS_ENTRY = "SelectProcessEntry"; + String SELECT_DATA_CATEGORIES = "SelectDataCategories"; + String CONTEXT = "Context"; + String CATEGROY = "Category"; + String PROCESSOR = "Processor"; + String SELECT_CATEGORY_PROCESSOR_ITEMS = "SelectCategoryProcessorItems"; + String SELECT_PROCESSOR = "SelectProcessor"; + String SELECT_ONE_DATA_TYPE = "SelectOneDataType"; + String SELECT_CATEGORY = "SelectCategory"; + String RESUME_PROCESS_METHOD_AT_ENTRY = "ResumeProcessMethodAtEntry"; + String RESUME_FOLLOWING_ENTRY_DEFAULT_COMPLETE = "ResumeFollowingEntryDefaultComplete"; + String COMPLETE_METHOD = "CompleteMethod"; + String REMEMBER_DECISION_DONT_SHOW_AGAIN = "RememberDecisionDontShowAgain"; + String REVERT_DECISION_IN_SETTINGS = "RevertDecisionInSettings"; + String EDIT_STORED_DATA_FOR_SELECTED_PROCESSOR = "EditStoredDataForSelectedProcessor"; + String REMOVE_STORED_DATA_RESET_DEFAULT_FOR_SELECTED_PROCESSOR = "RemoveStoredDataResetDefaultsForSelectedProcessor"; + String REMOVE_ALL_STORED_DATA_RESET_DEFAULTS = "Display Settings"; + String RESET_SETTINGS_FOR_ALL_PROCESSORS = "ResetSettingsForAllProcessors"; + String EXPAND_ALL_PROCESSOR_ITEMS = "ExpandAllProcessorItems"; + String COLLAPSE_ALL_PROCESSOR_ITEMS = "CollapseAllProcessorItems"; + String DISPLAY_SETTINGS = "DisplaySettings"; + String YES = "Yes"; + String NO = "No"; + String OPTIONS = "Options"; + String SYSTEM_DEFAULT = "SystemDefault"; + String RESET_SETTINGS_FOR_SELECTED_PROCESSORS = "ResetSettingsForSelectedProcessors"; + String USE_SYSTEM_OPTIONS = "UseSystemOptions"; + String NO_SYSTEM_OPTIONS_AVAILABLE = "NoSystemOptionsAvailable"; + String USE_SPECIFIC_OPTIONS = "UseSpecificOptions"; + String PROCESSOR_OFFERS_NO_OPTIONS = "ProcessorOffersNoOptions"; + String EDIT_PROCESSOR_OPTIONS = "EditProcessorOptions"; + String SELECT_OPTIONS_FOR_PROCESSOR_NAME = "SelectOptionsForProcessorName"; + String MANAGE_PROCESSOR_OPTIONS = "ManageProcessorOptions"; + String MANAGE_PREFERENCES = "ManagePreferences"; + String PROCESSOR_OPTIONS_BELOW_SELECT_TO_MANAGE_REMOVE_STATE = "ProcessorOptionsBelowSelectToManageRemoveState"; + String CHOOSE_LOCATION = "ChooseLocation"; + String TEXT = "Text"; + String NAMED_TRACE = "NamedTrace"; + String UNKNOWN = "Unknown"; + String DELETE_PEAKS = "DeletePeaks"; + String PEAKS_DELETED = "PeaksDeleted"; + String PEAKS_UNDELETED = "PeaksUndeleted"; + String DELETE_SCAN_TARGETS = "DeleteScanTargets"; + String GENERIC = "Generic"; + String NA = "NA"; + String MANDATORY = "Mandatory"; + String ADDITIONAL = "Additional"; + String CHROMATOGRAM_INTENSITY_Y_AXIS = "ChromatogramIntensityYAxis"; + String TITLE = "Title"; + String FORMAT = "Format"; + String SHOW = "Show"; + String POSITION = "Position"; + String FONT_NAME = "FontName"; + String FONT_SIZE = "FontSize"; + String FONT_STYLE = "FontStyle"; + String GRID_LINE_STYLE = "GridLineStyle"; + String GRID_LINE_COLOR = "GridLineColor"; + String SHOW_AXIS_TITLE = "ShowAxisTitle"; + String CHROMATOGRAM_MILISECONDS_X_AXIS = "ChromatogramMilisecondsXAxis"; + String CHROMATOGRAM_MINUTES_X_AXIS = "ChromatogramMinutesXAxis"; + String SHOW_AXIS_LINE = "ShowAxisLine"; + String SHOW_AXIS_POSITION_MARKER = "ShowAxisPositionMarker"; + String CHROMATOGRAM_SCANS_X_AXIS = "ChromatogramScansXAxis"; + String CHROMATOGRAM_SECONDS_X_AXIS = "ChromatogramSecondsXAxis"; + String LEFT_TOP = "LeftTop"; + String LEFT_CENTER = "LeftCenter"; + String RIGHT_TOP = "RightTop"; + String BOTTOM_LEFT = "BottomLeft"; + String BOTTOM_CENTER = "BottomCenter"; + String BOTTOM_RIGHT = "BottomRight"; + String TIME_RANGE_PATH = "TimeRangePath"; + String EDITOR_TSD = "EditorTSD"; + String BASELINE = "Baseline"; + String COMPRESSION_TYPE = "CompressionType"; + String DISPLAY_COLOR_SCHEME = "DisplayColorScheme"; +} diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/MethodFileSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/MethodFileSupport.java index 83cdfe6d42..797af3b42e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/MethodFileSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/MethodFileSupport.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2021 Lablicate GmbH. + * Copyright (c) 2021, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -22,6 +22,8 @@ import org.eclipse.chemclipse.processing.methods.IProcessMethod; import org.eclipse.chemclipse.processing.ui.support.ProcessingInfoPartSupport; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.SWT; @@ -39,7 +41,7 @@ public static boolean saveProccessMethod(IProcessMethod processMethod) throws No Shell shell = Display.getDefault().getActiveShell(); File currentFile = processMethod.getSourceFile(); - String filename = currentFile != null ? currentFile.getName() : "ProcessMethod"; + String filename = currentFile != null ? currentFile.getName() : ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROCESS_METHOD_FILENAME); return saveProccessMethod(shell, processMethod, filename); } @@ -52,7 +54,7 @@ public static boolean saveProccessMethod(Shell shell, IProcessMethod processMeth FileDialog dialog = new FileDialog(shell, SWT.SAVE); dialog.setFilterPath(Activator.getDefault().getSettingsPath()); dialog.setFileName(fileName); - dialog.setText("Save Process Method As..."); + dialog.setText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SAVE_PROCESS_METHOD_AS) + "..."); dialog.setOverwrite(true); // MethodConverterSupport converterSupport = MethodConverter.getMethodConverterSupport(); @@ -66,7 +68,7 @@ public static boolean saveProccessMethod(Shell shell, IProcessMethod processMeth // ISupplier selectedSupplier = converterSupport.getSupplier().get(index); if(selectedSupplier == null) { - MessageDialog.openInformation(shell, "Save Process Method As", "The requested converter does not exists."); + MessageDialog.openInformation(shell, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SAVE_PROCESS_METHOD_AS), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.REQUESTED_CONVERTER_DOES_NOT_EXIST)); return false; } // diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/MethodSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/MethodSupport.java index 847b9369e4..ecbf055b32 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/MethodSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/MethodSupport.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2020 Lablicate GmbH. + * Copyright (c) 2020, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -24,11 +24,9 @@ public class MethodSupport { */ public static final ListProcessEntryContainer getContainer(Object object) { - if(object instanceof IProcessEntry) { - IProcessEntry processEntry = (IProcessEntry)object; + if(object instanceof IProcessEntry processEntry) { ProcessEntryContainer parent = processEntry.getParent(); - if(parent instanceof ListProcessEntryContainer) { - ListProcessEntryContainer container = (ListProcessEntryContainer)parent; + if(parent instanceof ListProcessEntryContainer container) { if(!container.isReadOnly()) { return container; } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/MethodSupportUI.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/MethodSupportUI.java index ac2bba49ae..b3993decf1 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/MethodSupportUI.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/MethodSupportUI.java @@ -37,6 +37,7 @@ import org.eclipse.chemclipse.progress.core.StatusLineLogger; import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; +import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider; import org.eclipse.chemclipse.support.events.IChemClipseEvents; import org.eclipse.chemclipse.support.settings.UserManagement; import org.eclipse.chemclipse.support.ui.provider.AbstractLabelProvider; @@ -44,6 +45,8 @@ import org.eclipse.chemclipse.swt.ui.components.IMethodListener; import org.eclipse.chemclipse.swt.ui.notifier.UpdateNotifierUI; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.part.support.SupplierEditorSupport; import org.eclipse.chemclipse.ux.extension.xxd.ui.swt.PreferencesConfig; import org.eclipse.chemclipse.xxd.process.ui.preferences.PreferencePageChromatogramExport; @@ -98,9 +101,9 @@ public void setMethodListener(IMethodListener methodListener) { public IPreferencePage[] getPreferencePages() { IPreferencePage preferencePageReportExport = new PreferencePageReportExport(); - preferencePageReportExport.setTitle("Report Export"); + preferencePageReportExport.setTitle(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.REPORT_EXPORT)); IPreferencePage preferencePageChromatogramExport = new PreferencePageChromatogramExport(); - preferencePageChromatogramExport.setTitle("Chromatogram Export"); + preferencePageChromatogramExport.setTitle(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CHROMATOGRAM_EXPORT)); // return new IPreferencePage[]{preferencePageReportExport, preferencePageChromatogramExport}; } @@ -142,8 +145,8 @@ private ComboViewer createComboMethod(Composite parent) { @Override public String getText(Object element) { - if(element instanceof IProcessMethod) { - return ((IProcessMethod)element).getName(); + if(element instanceof IProcessMethod processMethod) { + return processMethod.getName(); } return null; } @@ -159,8 +162,8 @@ public String getText(Object element) { public void widgetSelected(SelectionEvent e) { Object object = comboViewer.getStructuredSelection().getFirstElement(); - if(object instanceof IProcessMethod) { - PreferenceSupplier.setSelectedMethodName(((IProcessMethod)object).getName()); + if(object instanceof IProcessMethod processMethod) { + PreferenceSupplier.setSelectedMethodName(processMethod.getName()); } enableWidgets(); } @@ -174,7 +177,7 @@ private Button createButtonAddMethod(Composite parent) { Button button = new Button(parent, SWT.PUSH); button.setText(""); button.setToolTipText("Creates and adds a new method."); - button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_METHOD_ADD, IApplicationImage.SIZE_16x16)); + button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_METHOD_ADD, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { @Override @@ -187,7 +190,7 @@ public void widgetSelected(SelectionEvent e) { } else if(selectMethodDirectory(shell)) { createNewMethod(shell, true); } else { - MessageDialog.openError(shell, "Method Editor", "Please select a directory via the settings where your methods are located."); + MessageDialog.openError(shell, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.METHOD_EDITOR), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SELECT_METHODS_DIRECTORY)); } } }); @@ -199,8 +202,8 @@ private Button createButtonEditMethod(Composite parent) { Button button = new Button(parent, SWT.PUSH); button.setText(""); - button.setToolTipText("Edit the selected method."); - button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_METHOD_EDIT, IApplicationImage.SIZE_16x16)); + button.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.EDIT_SELECTED_METHOD)); + button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_METHOD_EDIT, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { @Override @@ -209,7 +212,7 @@ public void widgetSelected(SelectionEvent e) { Object object = comboViewerMethods.getStructuredSelection().getFirstElement(); File file = getProcessMethodFile(object); if(file != null) { - logger.info("Edit Method: " + file.getAbsolutePath()); + logger.info(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.EDIT_METHOD) + ": " + file.getAbsolutePath()); openProcessMethodEditor(file); } } @@ -223,21 +226,20 @@ private Button createButtonCopyMethod(Composite parent) { Button button = new Button(parent, SWT.PUSH); button.setText(""); button.setToolTipText("Copy the selected method."); - button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_METHOD_COPY, IApplicationImage.SIZE_16x16)); + button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_METHOD_COPY, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { Object objectSource = comboViewerMethods.getStructuredSelection().getFirstElement(); - if(objectSource instanceof IProcessMethod) { + if(objectSource instanceof IProcessMethod processMethod) { /* * Container */ - IProcessMethod processMethod = (IProcessMethod)objectSource; - if(processMethod instanceof ListProcessEntryContainer) { - if(((ListProcessEntryContainer)processMethod).isReadOnly()) { - MessageDialog.openInformation(e.display.getActiveShell(), "Copy Method", "You can't copy this method because it is a method container."); + if(processMethod instanceof ListProcessEntryContainer processEntryContainer) { + if(processEntryContainer.isReadOnly()) { + MessageDialog.openInformation(e.display.getActiveShell(), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COPY_METHOD), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CANT_COPY_METHOD_CONTAINER)); return; } } @@ -246,7 +248,7 @@ public void widgetSelected(SelectionEvent e) { */ File fileSource = getProcessMethodFile(objectSource); if(fileSource != null && fileSource.exists()) { - if(MessageDialog.openQuestion(e.display.getActiveShell(), "Copy Method", "Do you want to copy the method: " + fileSource.getName() + "?")) { + if(MessageDialog.openQuestion(e.display.getActiveShell(), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COPY_METHOD), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SHALL_COPY_METHOD, fileSource.getName()))) { /* * Process Method (Source) */ @@ -260,11 +262,10 @@ public void widgetSelected(SelectionEvent e) { if(fileSink != null && fileSink.exists()) { try (InputStream inputStreamSink = new FileInputStream(fileSink)) { IProcessingInfo processingInfoSink = MethodConverter.load(inputStreamSink, fileSource.getAbsolutePath(), null); - if(processingInfoSink.getProcessingResult() instanceof ProcessMethod) { + if(processingInfoSink.getProcessingResult() instanceof ProcessMethod processMethodSink) { /* * Copy the entries. */ - ProcessMethod processMethodSink = (ProcessMethod)processingInfoSink.getProcessingResult(); for(IProcessEntry processEntry : processMethodSource) { processMethodSink.addProcessEntry(processEntry); } @@ -292,7 +293,7 @@ public void widgetSelected(SelectionEvent e) { return; } // - MessageDialog.openInformation(e.display.getActiveShell(), "Copy Method", "Can't determine the file for copying, maybe it was already deleted or you don't have sufficient rights?"); + MessageDialog.openInformation(e.display.getActiveShell(), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COPY_METHOD), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CANT_COPY_METHOD_FILESYSTEM)); } } }); @@ -304,32 +305,31 @@ private Button createButtonDeleteMethod(Composite parent) { Button button = new Button(parent, SWT.PUSH); button.setText(""); - button.setToolTipText("Delete the selected method."); - button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_METHOD_DELETE, IApplicationImage.SIZE_16x16)); + button.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.DELETE_SELECTED_METHOD)); + button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_METHOD_DELETE, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { Object object = comboViewerMethods.getStructuredSelection().getFirstElement(); - if(object instanceof IProcessMethod) { - IProcessMethod processMethod = (IProcessMethod)object; - if(processMethod instanceof ListProcessEntryContainer) { - if(((ListProcessEntryContainer)processMethod).isReadOnly()) { - MessageDialog.openInformation(e.display.getActiveShell(), "Delete Method", "You can't delete this method because it is read only"); + if(object instanceof IProcessMethod processMethod) { + if(processMethod instanceof ListProcessEntryContainer listProcessEntryContainer) { + if(listProcessEntryContainer.isReadOnly()) { + MessageDialog.openInformation(e.display.getActiveShell(), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.DELETE_METHOD), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CANT_DELETE_METHOD_READONLY)); return; } } File file = getProcessMethodFile(object); if(file != null && file.exists()) { - if(MessageDialog.openQuestion(e.display.getActiveShell(), "Delete Method", "Do you want to delete the method: " + file.getName() + "?")) { + if(MessageDialog.openQuestion(e.display.getActiveShell(), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.DELETE_METHOD), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SHALL_DELETE_METHOD, file.getName()))) { file.delete(); PreferenceSupplier.setSelectedMethodName(""); computeMethodComboItems(); } return; } - MessageDialog.openInformation(e.display.getActiveShell(), "Delete Method", "Can't determine the file for deletion, maybe it was already deleted or you don't have sufficient rights?"); + MessageDialog.openInformation(e.display.getActiveShell(), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.DELETE_METHOD), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CANT_DELETE_METHOD_FILESYSTEM)); } } }); @@ -341,16 +341,16 @@ private Button createButtonExecuteMethod(Composite parent) { Button button = new Button(parent, SWT.PUSH); button.setText(""); - button.setToolTipText("Apply the method to the selected chromatogram(s)."); - button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_EXECUTE, IApplicationImage.SIZE_16x16)); + button.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.APPLY_METHOD_SELECTED_CHROMATOGRAM)); + button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_EXECUTE, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { Object object = comboViewerMethods.getStructuredSelection().getFirstElement(); - if(object instanceof IProcessMethod) { - runMethod((IProcessMethod)object, e.display.getActiveShell()); + if(object instanceof IProcessMethod processMethod) { + runMethod(processMethod, e.display.getActiveShell()); UpdateNotifierUI.update(e.display, IChemClipseEvents.TOPIC_EDITOR_CHROMATOGRAM_UPDATE, "The process method has been applied."); } } @@ -363,8 +363,8 @@ private Button createButtonMethodDirectory(Composite parent) { Button button = new Button(parent, SWT.PUSH); button.setText(""); - button.setToolTipText("Select the method directory."); - button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_FOLDER_OPENED, IApplicationImage.SIZE_16x16)); + button.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SELECT_METHOD_DIRECTORY)); + button.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_FOLDER_OPENED, IApplicationImageProvider.SIZE_16x16)); button.addSelectionListener(new SelectionAdapter() { @Override @@ -381,7 +381,7 @@ public void widgetSelected(SelectionEvent e) { private boolean selectMethodDirectory(Shell shell) { DirectoryDialog directoryDialog = new DirectoryDialog(shell); - directoryDialog.setText("Method Directory"); + directoryDialog.setText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.METHOD_DIRECTORY)); directoryDialog.setFilterPath(MethodConverter.getUserMethodDirectory().getAbsolutePath()); // String directoryPath = directoryDialog.open(); @@ -397,7 +397,7 @@ private File createNewMethod(Shell shell, boolean openEditor) { FileDialog fileDialog = new FileDialog(shell, SWT.SAVE); fileDialog.setOverwrite(true); - fileDialog.setText("Process Method"); + fileDialog.setText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROCESS_METHOD)); fileDialog.setFileName(MethodConverter.DEFAULT_METHOD_FILE_NAME); fileDialog.setFilterExtensions(MethodConverter.DEFAULT_METHOD_FILE_EXTENSIONS); fileDialog.setFilterNames(MethodConverter.DEFAULT_METHOD_FILE_NAMES); @@ -412,7 +412,7 @@ private File createNewMethod(Shell shell, boolean openEditor) { file = new File(filePath); ProcessMethod processMethod = new ProcessMethod(ProcessMethod.CHROMATOGRAPHY); processMethod.setOperator(UserManagement.getCurrentUser()); - processMethod.setDescription("Process Method"); + processMethod.setDescription(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROCESS_METHOD)); // IProcessingInfo processingInfo = MethodConverter.convert(file, processMethod, MethodConverter.DEFAULT_METHOD_CONVERTER_ID, new NullProgressMonitor()); if(!processingInfo.hasErrorMessages()) { @@ -494,13 +494,13 @@ public void run(IProgressMonitor monitor) throws InvocationTargetException, Inte } catch(InvocationTargetException e) { IProcessingInfo processingInfo = new ProcessingInfo<>(); processingInfo.addErrorMessage(processMethod.getName(), "Execution failed", e.getCause()); - StatusLineLogger.setInfo(InfoType.ERROR_MESSAGE, "Failed to execute process method. See Feedback for details."); + StatusLineLogger.setInfo(InfoType.ERROR_MESSAGE, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROCESS_METHOD_FAILED_SEE_FEEDBACK)); ProcessingInfoPartSupport.getInstance().update(processingInfo); } catch(InterruptedException e) { Thread.currentThread().interrupt(); } catch(MethodCancelException e) { IProcessingInfo processingInfo = new ProcessingInfo<>(); - processingInfo.addWarnMessage(processMethod.getName(), "The process method execution has been cancelled."); + processingInfo.addWarnMessage(processMethod.getName(), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROCESS_METHOD_EXECUTION_CANCELED)); ProcessingInfoPartSupport.getInstance().update(processingInfo); } } @@ -527,8 +527,8 @@ private void enableWidgets() { private File getProcessMethodFile(Object object) { - if(object instanceof ProcessMethod) { - return ((ProcessMethod)object).getSourceFile(); + if(object instanceof ProcessMethod processMethod) { + return processMethod.getSourceFile(); } return null; } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/ProcessingWizard.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/ProcessingWizard.java index 72547c2410..3c37ca2a86 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/ProcessingWizard.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/ProcessingWizard.java @@ -18,6 +18,8 @@ import org.eclipse.chemclipse.processing.DataCategory; import org.eclipse.chemclipse.processing.methods.IProcessEntry; import org.eclipse.chemclipse.processing.supplier.IProcessSupplierContext; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.jface.dialogs.DialogSettings; import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.WizardDialog; @@ -32,7 +34,7 @@ public class ProcessingWizard extends Wizard { private ProcessingWizard() { - setWindowTitle("Settings"); + setWindowTitle(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SETTINGS)); setDialogSettings(new DialogSettings(PROCESSING_SECTION)); setNeedsProgressMonitor(true); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/ProcessingWizardPage.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/ProcessingWizardPage.java index 596de46040..537bd0eb1b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/ProcessingWizardPage.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/ProcessingWizardPage.java @@ -31,6 +31,8 @@ import org.eclipse.chemclipse.processing.supplier.IProcessSupplierContext; import org.eclipse.chemclipse.support.ui.provider.AbstractLabelProvider; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.preferences.PreferenceConstants; import org.eclipse.chemclipse.xxd.process.comparators.NameComparator; import org.eclipse.jface.preference.IPreferenceStore; @@ -79,8 +81,8 @@ protected ProcessingWizardPage(Map contexts, Da Collections.sort(this.dataCategories, (c1, c2) -> c1.name().compareTo(c2.name())); } processContext = contexts.entrySet().iterator().next().getKey(); - setTitle("Process Entry"); - setDescription("Select a chromatogram filter, integrator, identifier ... ."); + setTitle(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROCESS_ENTRY)); + setDescription(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SELECT_PROCESS_ENTRY)); } @Override @@ -90,7 +92,7 @@ public void createControl(Composite parent) { composite.setLayout(new GridLayout(1, false)); // if(dataCategories.size() > 1) { - createLabel(composite, "Select the data categorie(s) to list processor(s)."); + createLabel(composite, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SELECT_DATA_CATEGORIES)); for(DataCategory dataCategory : dataCategories) { /* * Set the default visibility. @@ -110,13 +112,13 @@ public void widgetSelected(SelectionEvent e) { } // if(processSupplierContextMap.size() > 1) { - createLabel(composite, "Context"); + createLabel(composite, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CONTEXT)); createComboViewerContext(composite); } // - createLabel(composite, "Category"); + createLabel(composite, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CATEGROY)); comboViewerCategory = createComboViewerCategory(composite); - createLabel(composite, "Processor"); + createLabel(composite, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROCESSOR)); comboViewerProcessor = createComboViewerProcessor(composite); // updateComboDataCategoryItems(); @@ -156,7 +158,7 @@ private static Button createDataTypeCheckbox(Composite parent, DataCategory data Button button = new Button(parent, SWT.CHECK); button.setData(dataCategory); button.setText(dataCategory.label()); - button.setToolTipText("Select the " + dataCategory.name() + " processor item(s)."); + button.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SELECT_CATEGORY_PROCESSOR_ITEMS, dataCategory.name())); button.setSelection(getDataTypeSelection(dataCategory)); button.addSelectionListener(new SelectionAdapter() { @@ -199,10 +201,6 @@ private void createLabel(Composite parent, String text) { private void updateComboDataCategoryItems() { - if(dataCategorySelections == null) { - return; - } - // selectedDataTypes.clear(); if(dataCategories.size() == 1) { selectedDataTypes.add(dataCategories.get(0)); @@ -261,14 +259,14 @@ private ComboViewer createComboViewerCategory(Composite parent) { @Override public String getText(Object element) { - if(element instanceof ProcessCategory) { - return ((ProcessCategory)element).name; + if(element instanceof ProcessCategory processCategory) { + return processCategory.name; } return "-"; } }); // - combo.setToolTipText("Select a process category."); + combo.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SELECT_CATEGORY)); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.widthHint = 150; combo.setLayoutData(gridData); @@ -287,8 +285,7 @@ public void widgetSelected(SelectionEvent e) { private void updateCategory() { Object object = comboViewerCategory.getStructuredSelection().getFirstElement(); - if(object instanceof ProcessCategory) { - ProcessCategory category = (ProcessCategory)object; + if(object instanceof ProcessCategory category) { List> suppliers = category.processorSuppliers; comboViewerProcessor.setInput(suppliers); if(suppliers.size() == 1) { @@ -325,7 +322,7 @@ public String getText(Object element) { } }); // - combo.setToolTipText("Select a processor."); + combo.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SELECT_PROCESSOR)); GridData gridData = new GridData(GridData.FILL_HORIZONTAL); gridData.widthHint = 150; combo.setLayoutData(gridData); @@ -368,20 +365,20 @@ private void validate() { } if(selected < 1) { setPageComplete(false); - setErrorMessage("Please select at least one data type"); + setErrorMessage(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SELECT_ONE_DATA_TYPE)); return; } } // if(comboViewerCategory.getSelection().isEmpty()) { setPageComplete(false); - setErrorMessage("Please select a category"); + setErrorMessage(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SELECT_CATEGORY)); return; } // if(comboViewerProcessor.getSelection().isEmpty()) { setPageComplete(false); - setErrorMessage("Please select a processor"); + setErrorMessage(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SELECT_PROCESSOR)); return; } // diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/ResumeMethodDialog.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/ResumeMethodDialog.java index b532499167..7c6d2b53d7 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/ResumeMethodDialog.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/ResumeMethodDialog.java @@ -19,6 +19,8 @@ import org.eclipse.chemclipse.support.ui.provider.AbstractLabelProvider; import org.eclipse.chemclipse.support.ui.provider.ListContentProvider; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.preferences.PreferenceConstants; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IMessageProvider; @@ -57,8 +59,8 @@ public void setInput(ProcessEntryContainer container) { public void create() { super.create(); - setTitle("Process Method"); - setMessage("Select to resume the method at the given process entry.", IMessageProvider.INFORMATION); + setTitle(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROCESS_METHOD)); + setMessage(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RESUME_PROCESS_METHOD_AT_ENTRY), IMessageProvider.INFORMATION); getButton(IDialogConstants.CANCEL_ID).setEnabled(true); getButton(IDialogConstants.OK_ID).setText("Process"); } @@ -76,7 +78,7 @@ protected Control createDialogArea(Composite parent) { composite.setLayoutData(new GridData(GridData.FILL_BOTH)); composite.setLayout(new GridLayout(1, true)); // - createLabel(composite, "Resume processing at the following entry. By default, use the complete method."); + createLabel(composite, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RESUME_FOLLOWING_ENTRY_DEFAULT_COMPLETE)); comboViewer = createComboViewerProcessEntry(composite); labelDescription = createLabel(composite, ""); createButtonResumeMethodOption(composite); @@ -89,7 +91,7 @@ protected Control createDialogArea(Composite parent) { private void initialize() { List processEntries = new ArrayList<>(); - processEntries.add("Complete Method"); + processEntries.add(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COMPLETE_METHOD)); // if(container != null) { for(IProcessEntry processEntry : container) { @@ -120,10 +122,10 @@ private ComboViewer createComboViewerProcessEntry(Composite parent) { @Override public String getText(Object element) { - if(element instanceof IProcessEntry) { - return ((IProcessEntry)element).getName(); - } else if(element instanceof String) { - return (String)element; + if(element instanceof IProcessEntry processEntry) { + return processEntry.getName(); + } else if(element instanceof String text) { + return text; } return null; } @@ -139,9 +141,9 @@ public String getText(Object element) { public void widgetSelected(SelectionEvent e) { Object element = comboViewer.getStructuredSelection().getFirstElement(); - if(element instanceof IProcessEntry) { + if(element instanceof IProcessEntry processEntry) { resumeIndex = combo.getSelectionIndex() - 1; - labelDescription.setText(((IProcessEntry)element).getDescription()); + labelDescription.setText(processEntry.getDescription()); } else { resumeIndex = ProcessEntryContainer.DEFAULT_RESUME_INDEX; labelDescription.setText(""); @@ -156,8 +158,8 @@ private Button createButtonResumeMethodOption(Composite parent) { Button button = new Button(parent, SWT.CHECK); button.setLayoutData(new GridData(SWT.RIGHT, SWT.BOTTOM, true, false)); - button.setText("Remember my decision and don't show the dialog again."); - button.setToolTipText("You can revert this decision in the settings."); + button.setText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.REMEMBER_DECISION_DONT_SHOW_AGAIN)); + button.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.REVERT_DECISION_IN_SETTINGS)); button.setSelection(!Activator.getDefault().getPreferenceStore().getBoolean(PreferenceConstants.P_SHOW_RESUME_METHOD_DIALOG)); button.addSelectionListener(new SelectionAdapter() { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/SettingsPreferencesEditPage.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/SettingsPreferencesEditPage.java index 9f82c078a9..a58bb7e88a 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/SettingsPreferencesEditPage.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/SettingsPreferencesEditPage.java @@ -26,6 +26,9 @@ import org.eclipse.chemclipse.processing.supplier.IProcessorPreferences.DialogBehavior; import org.eclipse.chemclipse.rcp.ui.icons.core.ApplicationImageFactory; import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImage; +import org.eclipse.chemclipse.rcp.ui.icons.core.IApplicationImageProvider; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.viewers.ColumnLabelProvider; import org.eclipse.jface.viewers.DoubleClickEvent; @@ -152,7 +155,7 @@ private void createToolBar(Composite parent) { private void createToolItemEdit(ToolBar toolBar) { ToolItem toolItem = new ToolItem(toolBar, SWT.PUSH); - toolItem.setToolTipText("Edit the stored data for the selected processor."); + toolItem.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.EDIT_STORED_DATA_FOR_SELECTED_PROCESSOR)); toolItem.addSelectionListener(new SelectionAdapter() { @Override @@ -163,7 +166,7 @@ public void widgetSelected(SelectionEvent e) { }); // toolItem.setEnabled(false); - toolItem.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_EDIT, IApplicationImage.SIZE_16x16)); + toolItem.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_EDIT, IApplicationImageProvider.SIZE_16x16)); // toolItemEditControl.set(toolItem); } @@ -181,8 +184,8 @@ public void widgetSelected(SelectionEvent e) { }); // toolItem.setEnabled(false); - toolItem.setToolTipText("Removes the stored data for the selected processor and resets it to the defaults."); - toolItem.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_DELETE, IApplicationImage.SIZE_16x16)); + toolItem.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.REMOVE_STORED_DATA_RESET_DEFAULT_FOR_SELECTED_PROCESSOR)); + toolItem.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_DELETE, IApplicationImageProvider.SIZE_16x16)); // toolItemDeleteControl.set(toolItem); } @@ -190,14 +193,14 @@ public void widgetSelected(SelectionEvent e) { private void createToolItemDeleteAll(ToolBar toolBar) { ToolItem toolItem = new ToolItem(toolBar, SWT.PUSH); - toolItem.setToolTipText("Removes all stored data and resets to the defaults."); - toolItem.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_DELETE_ALL, IApplicationImage.SIZE_16x16)); + toolItem.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.REMOVE_ALL_STORED_DATA_RESET_DEFAULTS)); + toolItem.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_DELETE_ALL, IApplicationImageProvider.SIZE_16x16)); toolItem.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - if(MessageDialog.openConfirm(e.display.getActiveShell(), "Settings", "Would you like to reset the settings for all processors?")) { + if(MessageDialog.openConfirm(e.display.getActiveShell(), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SETTINGS), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RESET_SETTINGS_FOR_ALL_PROCESSORS))) { for(IProcessorPreferences preferences : preferenceSupplier.get()) { preferences.reset(); } @@ -210,7 +213,7 @@ public void widgetSelected(SelectionEvent e) { private void createToolItemExpand(ToolBar toolBar) { ToolItem toolItem = new ToolItem(toolBar, SWT.PUSH); - toolItem.setToolTipText("Expand all processor items."); + toolItem.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.EXPAND_ALL_PROCESSOR_ITEMS)); toolItem.addSelectionListener(new SelectionAdapter() { @Override @@ -221,13 +224,13 @@ public void widgetSelected(SelectionEvent e) { }); // toolItem.setEnabled(true); - toolItem.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_EXPAND_ALL, IApplicationImage.SIZE_16x16)); + toolItem.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_EXPAND_ALL, IApplicationImageProvider.SIZE_16x16)); } private void createToolItemCollapse(ToolBar toolBar) { ToolItem toolItem = new ToolItem(toolBar, SWT.PUSH); - toolItem.setToolTipText("Collapse all processor items."); + toolItem.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COLLAPSE_ALL_PROCESSOR_ITEMS)); toolItem.addSelectionListener(new SelectionAdapter() { @Override @@ -238,7 +241,7 @@ public void widgetSelected(SelectionEvent e) { }); // toolItem.setEnabled(true); - toolItem.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_COLLAPSE_ALL, IApplicationImage.SIZE_16x16)); + toolItem.setImage(ApplicationImageFactory.getInstance().getImage(IApplicationImage.IMAGE_COLLAPSE_ALL, IApplicationImageProvider.SIZE_16x16)); } private void createColumnName(TreeViewer treeViewer) { @@ -250,8 +253,8 @@ private void createColumnName(TreeViewer treeViewer) { @Override public String getText(Object element) { - if(element instanceof TreeNode) { - element = ((TreeNode)element).getValue(); + if(element instanceof TreeNode treeNode) { + element = treeNode.getValue(); } // IProcessorPreferences entry = getEntry(element); @@ -268,7 +271,7 @@ private void createColumnAskSettings(TreeViewer treeViewer) { TreeViewerColumn column = new TreeViewerColumn(treeViewer, SWT.CENTER); column.getColumn().setWidth(125); - column.getColumn().setText("Display Settings"); + column.getColumn().setText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.DISPLAY_SETTINGS)); column.setLabelProvider(new ColumnLabelProvider() { @Override @@ -277,9 +280,9 @@ public String getText(Object element) { IProcessorPreferences preferences = getEntry(element); if(preferences != null) { if(preferences.getDialogBehaviour() == DialogBehavior.SHOW) { - return "yes"; + return ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.YES); } else { - return "no"; + return ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NO); } } // @@ -292,20 +295,20 @@ private void createColumnOptions(TreeViewer treeViewer) { TreeViewerColumn column = new TreeViewerColumn(treeViewer, SWT.NONE); column.getColumn().setWidth(500); - column.getColumn().setText("Options"); + column.getColumn().setText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.OPTIONS)); column.setLabelProvider(new ColumnLabelProvider() { @Override public String getText(Object element) { - if(element instanceof TreeNode) { - element = ((TreeNode)element).getValue(); + if(element instanceof TreeNode treeNode) { + element = treeNode.getValue(); } // IProcessorPreferences preferences = getEntry(element); if(preferences != null) { if(preferences.isUseSystemDefaults()) { - return "(System Default)"; + return "(" + ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SYSTEM_DEFAULT) + ")"; } else { return preferences.getUserSettingsAsString(); } @@ -318,7 +321,7 @@ public String getText(Object element) { private void resetSettings(Shell shell) { - if(MessageDialog.openConfirm(shell, "Settings", "Would you like to reset the settings for the selected processors?")) { + if(MessageDialog.openConfirm(shell, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SETTINGS), ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RESET_SETTINGS_FOR_SELECTED_PROCESSORS))) { Object[] array = treeViewerControl.get().getStructuredSelection().toArray(); for(Object object : array) { getEntry(object).reset(); @@ -375,8 +378,8 @@ private void updateTree() { @SuppressWarnings("unchecked") private static IProcessorPreferences getEntry(Object element) { - if(element instanceof TreeNode) { - element = ((TreeNode)element).getValue(); + if(element instanceof TreeNode treeNode) { + element = treeNode.getValue(); } // if(element instanceof IProcessorPreferences) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/SettingsPreferencesPage.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/SettingsPreferencesPage.java index cd0347af3e..155ca8e120 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/SettingsPreferencesPage.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/SettingsPreferencesPage.java @@ -17,6 +17,8 @@ import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.processing.supplier.IProcessorPreferences; import org.eclipse.chemclipse.processing.supplier.IProcessorPreferences.DialogBehavior; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.swt.SWT; @@ -77,7 +79,7 @@ public boolean getIsDontAskAgainEdited() { return isDontAskAgain; } - public String getSettingsEdited() throws IOException { + public String getSettingsEdited() { return jsonSettings; } @@ -112,10 +114,10 @@ private void createSystemOptions(Composite parent) { private Button createButtonDefault(Composite parent) { Button button = new Button(parent, SWT.RADIO); - button.setText("Use System Options"); + button.setText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.USE_SYSTEM_OPTIONS)); if(preferences.requiresUserSettings()) { button.setEnabled(false); - button.setToolTipText("This processor does not offer system options or they are not applicable at the moment."); + button.setToolTipText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NO_SYSTEM_OPTIONS_AVAILABLE)); } // return button; @@ -136,7 +138,7 @@ private void createUserOptions(Composite parent) { private Button createButtonUser(Composite parent) { Button button = new Button(parent, SWT.RADIO); - button.setText("Use Specific Options"); + button.setText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.USE_SPECIFIC_OPTIONS)); // return button; } @@ -148,8 +150,8 @@ private SettingsUI createSettingsUI(Composite parent) { try { settingsUI = new SettingsUI<>(parent, preferences, showProfileToolbar); settingsUI.setLayoutData(new GridData(GridData.FILL_BOTH)); - } catch(IOException e1) { - throw new RuntimeException("Reading the settings failed.", e1); + } catch(IOException e) { + throw new RuntimeException("Reading the settings failed.", e); } // return settingsUI; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/SettingsUI.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/SettingsUI.java index c2704c7419..7a6010cb79 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/SettingsUI.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/SettingsUI.java @@ -24,6 +24,8 @@ import org.eclipse.chemclipse.logging.core.Logger; import org.eclipse.chemclipse.processing.supplier.IProcessorPreferences; import org.eclipse.chemclipse.support.settings.parser.InputValue; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.methods.SettingsUIProvider.SettingsUIControl; import org.eclipse.core.databinding.validation.ValidationStatus; import org.eclipse.core.runtime.Adapters; @@ -95,7 +97,7 @@ private static final class DefaultSettingsUIProvider implements SettingsUIPro @Override public SettingsUIControl createUI(Composite parent, IProcessorPreferences preferences, boolean showProfileToolbar) throws IOException { - return new SettingsUIControlImplementation(parent, preferences, showProfileToolbar); + return new SettingsUIControlImplementation(parent, preferences); } } @@ -106,7 +108,7 @@ private final static class SettingsUIControlImplementation implements Setting private final IProcessorPreferences preferences; private final Composite container; - public SettingsUIControlImplementation(Composite parent, IProcessorPreferences preferences, boolean showProfileToolbar) throws IOException { + public SettingsUIControlImplementation(Composite parent, IProcessorPreferences preferences) throws IOException { container = createContainer(parent); this.preferences = preferences; @@ -120,7 +122,7 @@ public SettingsUIControlImplementation(Composite parent, IProcessorPreferences 0) { + if(!widgetItems.isEmpty()) { createOptionWidgets(container); } else { createNoOptionsMessage(container); @@ -157,7 +159,7 @@ private void createOptionWidgets(Composite parent) { private void createNoOptionsMessage(Composite parent) { Label label = new Label(parent, SWT.NONE); - label.setText("This processor offers no options."); + label.setText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROCESSOR_OFFERS_NO_OPTIONS)); label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); } @@ -195,8 +197,7 @@ public void addChangeListener(Listener listener) { control.addListener(SWT.MouseUp, listener); control.addListener(SWT.MouseDoubleClick, listener); // - if(control instanceof IChangeListener) { - IChangeListener changeListener = (IChangeListener)control; + if(control instanceof IChangeListener changeListener) { changeListener.addChangeListener(listener); } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/SettingsWizard.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/SettingsWizard.java index ceb3cc01ff..8ab9623c64 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/SettingsWizard.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/SettingsWizard.java @@ -19,13 +19,16 @@ import java.util.function.Supplier; import org.eclipse.chemclipse.processing.supplier.IProcessSupplier; -import org.eclipse.chemclipse.processing.supplier.NodeProcessorPreferences; import org.eclipse.chemclipse.processing.supplier.IProcessSupplierContext; import org.eclipse.chemclipse.processing.supplier.IProcessorPreferences; import org.eclipse.chemclipse.processing.supplier.IProcessorPreferences.DialogBehavior; +import org.eclipse.chemclipse.processing.supplier.NodeProcessorPreferences; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.runtime.preferences.IEclipsePreferences; import org.eclipse.core.runtime.preferences.InstanceScope; import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.jface.window.Window; import org.eclipse.jface.wizard.Wizard; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Composite; @@ -61,17 +64,17 @@ public boolean performFinish() { public static boolean openEditPreferencesWizard(Shell shell, IProcessorPreferences preferences, boolean showProfileToolbar) throws IOException { IProcessSupplier processorSupplier = preferences.getSupplier(); - SettingsWizard wizard = new SettingsWizard("Edit Processor Options"); + SettingsWizard wizard = new SettingsWizard(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.EDIT_PROCESSOR_OPTIONS)); // SettingsPreferencesPage page = new SettingsPreferencesPage<>(preferences, showProfileToolbar); - page.setTitle("Select the options for " + processorSupplier.getName()); + page.setTitle(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SELECT_OPTIONS_FOR_PROCESSOR_NAME, processorSupplier.getName())); page.setMessage(processorSupplier.getDescription()); wizard.addPage(page); // WizardDialog wizardDialog = new WizardDialog(shell, wizard); wizardDialog.setMinimumPageSize(SettingsWizard.DEFAULT_WIDTH, SettingsWizard.DEFAULT_HEIGHT); // - if(wizardDialog.open() == WizardDialog.OK) { + if(wizardDialog.open() == Window.OK) { preferences.setAskForSettings(!page.getIsDontAskAgainEdited()); boolean useSystem = page.getIsUseSystemDefaultsEdited(); if(useSystem) { @@ -94,10 +97,10 @@ public static boolean openEditPreferencesWizard(Shell shell, IProcessorPrefe */ public static void openManagePreferencesWizard(Shell shell, Supplier>> preferenceSupplier) { - SettingsWizard wizard = new SettingsWizard("Manage Processor Options"); + SettingsWizard wizard = new SettingsWizard(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.MANAGE_PROCESSOR_OPTIONS)); SettingsPreferencesEditPage page = new SettingsPreferencesEditPage(preferenceSupplier); - page.setTitle("Manage Preferences"); - page.setDescription("Below you find all currently stored processor Options, select one to manage or remove the stored state"); + page.setTitle(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.MANAGE_PREFERENCES)); + page.setDescription(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PROCESSOR_OPTIONS_BELOW_SELECT_TO_MANAGE_REMOVE_STATE)); wizard.addPage(page); WizardDialog wizardDialog = new WizardDialog(shell, wizard) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/WidgetItem.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/WidgetItem.java index 2d1d7304fc..5aa3722bc2 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/WidgetItem.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/methods/WidgetItem.java @@ -25,6 +25,8 @@ import org.eclipse.chemclipse.support.ui.provider.AbstractLabelProvider; import org.eclipse.chemclipse.support.ui.provider.AdapterLabelProvider; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.databinding.validation.IValidator; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.fieldassist.ControlDecoration; @@ -131,11 +133,10 @@ public Object getValue() { /* * Text */ - if(control instanceof Text) { + if(control instanceof Text text) { /* * Text */ - Text text = (Text)control; String textValue = text.getText().trim(); // if(rawType == long.class || rawType == Long.class) { @@ -161,11 +162,10 @@ public Object getValue() { } else { return textValue; } - } else if(control instanceof Button) { + } else if(control instanceof Button button) { /* * Checkbox */ - Button button = (Button)control; return button.getSelection(); } else if(control instanceof Combo) { /* @@ -182,8 +182,7 @@ public Object getValue() { * Specific controls */ for(Object object : Activator.getDefault().getAnnotationWidgetServices()) { - if(object instanceof IAnnotationWidgetService) { - IAnnotationWidgetService annotationWidgetService = (IAnnotationWidgetService)object; + if(object instanceof IAnnotationWidgetService annotationWidgetService) { Class supportedClass = annotationWidgetService.getSupportedClass(); if(supportedClass.equals(rawType)) { return annotationWidgetService.getValue(currentSelection); @@ -265,8 +264,7 @@ private Control getSpecificControl(Composite parent) { Class rawType = inputValue.getRawType(); for(Object object : Activator.getDefault().getAnnotationWidgetServices()) { - if(object instanceof IAnnotationWidgetService) { - IAnnotationWidgetService annotationWidgetService = (IAnnotationWidgetService)object; + if(object instanceof IAnnotationWidgetService annotationWidgetService) { Class supportedClass = annotationWidgetService.getSupportedClass(); if(supportedClass.equals(rawType)) { return annotationWidgetService.createWidget(parent, inputValue.getDescription(), currentSelection); @@ -296,8 +294,8 @@ private ComboViewer createGenericCombo(Composite parent, ComboSupplier comboS combo.setLayoutData(gridData); comboViewer.setInput(comboSupplier.items()); // - if(currentSelection instanceof String) { - Object currentValue = comboSupplier.fromString((String)currentSelection); + if(currentSelection instanceof String stringSelection) { + Object currentValue = comboSupplier.fromString(stringSelection); if(currentValue != null) { comboViewer.setSelection(new StructuredSelection(currentValue)); } else { @@ -332,7 +330,7 @@ private Control createFileWidget(Composite parent) { label.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_DARK_GRAY)); String value = getValueAsString(); if(value == null || value.isEmpty()) { - label.setText("Please choose a location ..."); + label.setText(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CHOOSE_LOCATION)); } else { label.setText(value); } @@ -439,8 +437,8 @@ private ComboViewer createLabeledEnumComboViewerWidget(Composite parent, Enum @Override public String getText(Object element) { - if(element instanceof ILabel) { - return ((ILabel)element).label(); + if(element instanceof ILabel label) { + return label.label(); } return element.toString(); } @@ -469,12 +467,12 @@ public void selectionChanged(SelectionChangedEvent event) { private boolean getValueAsBoolean() { - if(currentSelection instanceof Boolean) { - return ((Boolean)currentSelection).booleanValue(); + if(currentSelection instanceof Boolean booleanSelection) { + return booleanSelection.booleanValue(); } // - if(currentSelection instanceof String) { - return Boolean.valueOf((String)currentSelection); + if(currentSelection instanceof String stringSelection) { + return Boolean.valueOf(stringSelection); } // return false; @@ -486,8 +484,8 @@ private String getValueAsString() { return ""; } // - if(currentSelection instanceof String) { - return (String)currentSelection; + if(currentSelection instanceof String stringSelection) { + return stringSelection; } else { return currentSelection.toString(); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/model/TracesExportOption.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/model/TracesExportOption.java index ee0257dec6..7b1fedd52a 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/model/TracesExportOption.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/model/TracesExportOption.java @@ -12,11 +12,13 @@ package org.eclipse.chemclipse.ux.extension.xxd.ui.model; import org.eclipse.chemclipse.support.text.ILabel; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; public enum TracesExportOption implements ILabel { - SIMPLE_TEXT("Text"), // - NAMED_TRACE("Named Trace"); // + SIMPLE_TEXT(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TEXT)), // + NAMED_TRACE(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NAMED_TRACE)); // private String label = ""; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/model/TracesSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/model/TracesSupport.java index ddbeb74c26..b498c63b43 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/model/TracesSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/model/TracesSupport.java @@ -19,6 +19,8 @@ import org.eclipse.chemclipse.msd.model.support.ScanSupport; import org.eclipse.chemclipse.support.comparator.SortOrder; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.preferences.PreferenceConstants; import org.eclipse.chemclipse.wsd.model.core.IScanWSD; import org.eclipse.chemclipse.wsd.model.core.support.WavelengthSupport; @@ -39,19 +41,17 @@ public static void copyTracesToClipboard(Display display, Object scan) { boolean sortTraces = isSortTraces(); IScan scanInstance = null; // - if(scan instanceof IScanMSD) { - IScanMSD scanMSD = (IScanMSD)scan; + if(scan instanceof IScanMSD scanMSD) { traces = ScanSupport.extractTracesText(scanMSD, maxCopyTraces, sortTraces); scanInstance = scanMSD; - } else if(scan instanceof IScanWSD) { - IScanWSD scanWSD = (IScanWSD)scan; + } else if(scan instanceof IScanWSD scanWSD) { traces = WavelengthSupport.extractTracesText(scanWSD, maxCopyTraces, sortTraces); scanInstance = scanWSD; } /* * Copy to clipboard */ - if(traces != null && scanInstance != null) { + if(traces != null) { TracesExportOption tracesExportOption = TracesSupport.getTracesExportOption(); switch(tracesExportOption) { case NAMED_TRACE: @@ -63,7 +63,7 @@ public static void copyTracesToClipboard(Display display, Object scan) { if(libraryInformation != null) { traces = libraryInformation.getName() + " | " + traces; } else { - traces = "Unknown | " + traces; + traces = ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.UNKNOWN) + " | " + traces; } break; default: diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/operations/DeletePeaksOperation.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/operations/DeletePeaksOperation.java index c224885894..4d52179465 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/operations/DeletePeaksOperation.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/operations/DeletePeaksOperation.java @@ -18,6 +18,8 @@ import org.eclipse.chemclipse.model.selection.IChromatogramSelection; import org.eclipse.chemclipse.support.events.IChemClipseEvents; import org.eclipse.chemclipse.swt.ui.notifier.UpdateNotifierUI; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.AbstractOperation; import org.eclipse.core.runtime.IAdaptable; @@ -35,7 +37,7 @@ public class DeletePeaksOperation extends AbstractOperation { public DeletePeaksOperation(Display display, IChromatogramSelection chromatogramSelection, List peaksToDelete) { - super("Delete Peaks"); + super(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.DELETE_PEAKS)); this.display = display; this.chromatogramSelection = chromatogramSelection; this.peaksToDelete = peaksToDelete; @@ -65,7 +67,7 @@ public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws Executi IChromatogram chromatogram = chromatogramSelection.getChromatogram(); chromatogram.removePeaks(peaksToDelete); - update("Peaks were deleted."); + update(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PEAKS_DELETED)); return Status.OK_STATUS; } @@ -79,7 +81,7 @@ private void update(String message) { @Override public String getLabel() { - return "Delete Peaks"; + return ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.DELETE_PEAKS); } @Override @@ -96,7 +98,7 @@ public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionE for(IPeak peak : peaksToDelete) { chromatogram.addPeak(peak); } - update("Peaks were added back again."); + update(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.PEAKS_UNDELETED)); return Status.OK_STATUS; } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/operations/DeleteScanTargetsOperation.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/operations/DeleteScanTargetsOperation.java index 2d15161227..a98f6883c6 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/operations/DeleteScanTargetsOperation.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/operations/DeleteScanTargetsOperation.java @@ -20,6 +20,8 @@ import org.eclipse.chemclipse.model.selection.IChromatogramSelection; import org.eclipse.chemclipse.support.events.IChemClipseEvents; import org.eclipse.chemclipse.swt.ui.notifier.UpdateNotifierUI; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.AbstractOperation; import org.eclipse.core.runtime.IAdaptable; @@ -38,7 +40,7 @@ public class DeleteScanTargetsOperation extends AbstractOperation { public DeleteScanTargetsOperation(Display display, IChromatogramSelection chromatogramSelection, List scansToClear) { - super("Delete Scans"); + super(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.DELETE_SCAN_TARGETS)); this.display = display; this.chromatogramSelection = chromatogramSelection; this.scansToClear = scansToClear; @@ -90,7 +92,7 @@ private void update() { @Override public String getLabel() { - return "Delete Scan Targets"; + return ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.DELETE_SCAN_TARGETS); } @Override diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/DataUpdateSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/DataUpdateSupport.java index 762f6be174..04f7300eda 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/DataUpdateSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/DataUpdateSupport.java @@ -234,11 +234,9 @@ private void handleCloseEvent(Event event, String[] properties) { */ if(properties != null) { Object object = event.getProperty(IChemClipseEvents.EVENT_BROKER_DATA); - if(object instanceof List) { - List elements = (List)object; + if(object instanceof List elements) { for(Object element : elements) { - if(element instanceof String) { - String topicToBeCleared = (String)element; + if(element instanceof String topicToBeCleared) { logger.info("Clear mapped objects of topic: " + topicToBeCleared); objectMap.remove(topicToBeCleared); } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/EditorUpdateSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/EditorUpdateSupport.java index 58dc4c2a22..d6af879a9d 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/EditorUpdateSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/EditorUpdateSupport.java @@ -53,8 +53,8 @@ public IChromatogramSelection getActiveEditorSelection() { for(MPart part : parts) { if(part.isVisible()) { Object object = part.getObject(); - if(object instanceof IChromatogramEditor) { - return ((IChromatogramEditor)object).getChromatogramSelection(); + if(object instanceof IChromatogramEditor chromatogramEditor) { + return chromatogramEditor.getChromatogramSelection(); } } } @@ -69,7 +69,7 @@ public IChromatogramSelection getActiveEditorSelection() { @SuppressWarnings("rawtypes") public List getChromatogramSelections() { - List chromatogramSelections = new ArrayList(); + List chromatogramSelections = new ArrayList<>(); if(partService != null) { try { Collection parts = partService.getParts(); @@ -91,7 +91,7 @@ public List getChromatogramSelections() { List parts = service.findElements(application, null, MPart.class, null); if(parts != null) { for(MPart part : parts) { - if(extractChromatogramSelections(part.getObject()).size() > 0) { + if(!extractChromatogramSelections(part.getObject()).isEmpty()) { chromatogramSelections.addAll(extractChromatogramSelections(part.getObject())); } } @@ -109,7 +109,7 @@ public List getChromatogramSelections() { public List getMassSpectrumSelections() { - List dataSelections = new ArrayList(); + List dataSelections = new ArrayList<>(); if(partService != null) { /* * TODO: see message @@ -123,8 +123,7 @@ public List getMassSpectrumSelections() { * MALDI */ IScanMSD selection = null; - if(object instanceof IMassSpectrumEditor) { - IMassSpectrumEditor editor = (IMassSpectrumEditor)object; + if(object instanceof IMassSpectrumEditor editor) { selection = editor.getScanSelection(); } // @@ -146,7 +145,7 @@ public List getMassSpectrumSelections() { public List getScanSelectionsXIR() { - List dataNMRSelections = new ArrayList(); + List dataNMRSelections = new ArrayList<>(); if(partService != null) { /* * TODO: see message @@ -160,8 +159,7 @@ public List getScanSelectionsXIR() { * XIR */ IScanXIR selection = null; - if(object instanceof IScanEditorXIR) { - IScanEditorXIR editor = (IScanEditorXIR)object; + if(object instanceof IScanEditorXIR editor) { selection = editor.getScanSelection(); } // @@ -183,12 +181,11 @@ public List getScanSelectionsXIR() { public List getDataNMRSelections(EPartService partService) { - List scanSelections = new ArrayList(); + List scanSelections = new ArrayList<>(); Collection parts = partService.getParts(); for(MPart part : parts) { Object object = part.getObject(); - if(object instanceof IScanEditorNMR) { - IScanEditorNMR editor = (IScanEditorNMR)object; + if(object instanceof IScanEditorNMR editor) { IDataNMRSelection selection = editor.getScanSelection(); if(selection != null) { scanSelections.add(selection); @@ -200,7 +197,7 @@ public List getDataNMRSelections(EPartService partService) { public List getQuantitationDatabases() { - List quantitationDatabases = new ArrayList(); + List quantitationDatabases = new ArrayList<>(); if(partService != null) { /* * TODO: see message @@ -209,8 +206,7 @@ public List getQuantitationDatabases() { Collection parts = partService.getParts(); for(MPart part : parts) { Object object = part.getObject(); - if(object instanceof IQuantitationDatabaseEditor) { - IQuantitationDatabaseEditor editor = (IQuantitationDatabaseEditor)object; + if(object instanceof IQuantitationDatabaseEditor editor) { quantitationDatabases.add(editor.getQuantitationDatabase()); } } @@ -236,7 +232,7 @@ private void addChromatogramSelection(List chromatogramS @SuppressWarnings("rawtypes") private void addChromatogramSelections(List chromatogramSelections, List selections) { - if(selections != null && selections.size() > 0) { + if(selections != null && !selections.isEmpty()) { chromatogramSelections.addAll(selections); } } @@ -250,20 +246,19 @@ private List extractChromatogramSelections(Object object /* * MSD/CSD/WSD or specialized Editor */ - if(object instanceof IChromatogramEditor) { - addChromatogramSelection(chromatogramSelections, ((IChromatogramEditor)object).getChromatogramSelection()); - } else if(object instanceof IChromatogramProjectEditor) { - addChromatogramSelections(chromatogramSelections, ((IChromatogramProjectEditor)object).getChromatogramSelections()); - } else if(object instanceof CompatibilityEditor) { + if(object instanceof IChromatogramEditor chromatogramEditor) { + addChromatogramSelection(chromatogramSelections, chromatogramEditor.getChromatogramSelection()); + } else if(object instanceof IChromatogramProjectEditor chromatogramProjectEditor) { + addChromatogramSelections(chromatogramSelections, chromatogramProjectEditor.getChromatogramSelections()); + } else if(object instanceof CompatibilityEditor compatibilityEditor) { /* * 3.x compatibility editor. */ - CompatibilityEditor compatibilityEditor = (CompatibilityEditor)object; IWorkbenchPart workbenchPart = compatibilityEditor.getPart(); - if(workbenchPart instanceof IChromatogramEditor) { - addChromatogramSelection(chromatogramSelections, ((IChromatogramEditor)workbenchPart).getChromatogramSelection()); - } else if(workbenchPart instanceof IChromatogramProjectEditor) { - addChromatogramSelections(chromatogramSelections, ((IChromatogramProjectEditor)workbenchPart).getChromatogramSelections()); + if(workbenchPart instanceof IChromatogramEditor chromatogramEditor) { + addChromatogramSelection(chromatogramSelections, chromatogramEditor.getChromatogramSelection()); + } else if(workbenchPart instanceof IChromatogramProjectEditor chromatogramProjectEditor) { + addChromatogramSelections(chromatogramSelections, chromatogramProjectEditor.getChromatogramSelections()); } } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/GenericSupplierEditorSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/GenericSupplierEditorSupport.java index 340a3246f0..0500cc9206 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/GenericSupplierEditorSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/GenericSupplierEditorSupport.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2020 Lablicate GmbH. + * Copyright (c) 2019, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -20,6 +20,8 @@ import org.eclipse.chemclipse.processing.converter.ISupplierFileIdentifier; import org.eclipse.chemclipse.ux.extension.ui.editors.EditorDescriptor; import org.eclipse.chemclipse.ux.extension.ui.provider.ISupplierFileEditorSupport; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.core.runtime.Adapters; import org.eclipse.e4.core.contexts.ContextInjectionFactory; import org.eclipse.e4.core.contexts.EclipseContextFactory; @@ -42,7 +44,7 @@ public GenericSupplierEditorSupport(ISupplierFileIdentifier fileIdentifier, Supp @Override public String getType() { - return "Generic"; + return ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.GENERIC); } @Override @@ -84,8 +86,8 @@ public boolean openEditor(File file, ISupplier supplier) { } Object invoke = ContextInjectionFactory.invoke(executable, Execute.class, eclipseContext, parameterContext, NO_EXECUTE_METHOD); if(NO_EXECUTE_METHOD != invoke) { - if(invoke instanceof Boolean) { - return ((Boolean)invoke).booleanValue(); + if(invoke instanceof Boolean booleanInvoke) { + return booleanInvoke.booleanValue(); } return true; } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/OverviewSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/OverviewSupport.java index 0be725bdd2..6618ab23a4 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/OverviewSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/OverviewSupport.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2021 Lablicate GmbH. + * Copyright (c) 2017, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -52,16 +52,14 @@ public boolean process(List objects, String topic) { /* * 0 => because only one property was used to register the event. */ - if(objects.size() > 0) { + if(!objects.isEmpty()) { Object object = objects.get(0); - if(object instanceof IChromatogramOverview) { - IChromatogramOverview chromatogramOverview = (IChromatogramOverview)object; + if(object instanceof IChromatogramOverview chromatogramOverview) { return fireUpdate(chromatogramOverview); } else if(object instanceof IChromatogramSelection) { IChromatogramSelection chromatogramSelection = (IChromatogramSelection)object; return updateChromatogramSelection(chromatogramSelection); - } else if(object instanceof File) { - File file = (File)object; + } else if(object instanceof File file) { return updateFile(file, topic); } else { if(topic.equals(IChemClipseEvents.TOPIC_CHROMATOGRAM_XXD_UPDATE_NONE)) { @@ -105,7 +103,7 @@ private boolean updateFile(File file, String topic) { if(data instanceof List) { @SuppressWarnings({"unchecked", "rawtypes"}) List list = (List)data; - if(list.size() > 0) { + if(!list.isEmpty()) { /* * IComplexSignalMeasurement */ diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/SupplierEditorSupport.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/SupplierEditorSupport.java index 2c56705978..8648d34330 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/SupplierEditorSupport.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/part/support/SupplierEditorSupport.java @@ -80,7 +80,7 @@ public SupplierEditorSupport(DataType dataType, Supplier contex private static List getSupplier(DataType dataType) { - List supplier = new ArrayList(); + List supplier = new ArrayList<>(); switch(dataType) { case MSD_NOMINAL: case MSD_TANDEM: @@ -161,8 +161,8 @@ public boolean openEditor(File file, ISupplier supplier) { } Object invoke = ContextInjectionFactory.invoke(executable, Execute.class, eclipseContext, parameterContext, NO_EXECUTE_METHOD); if(NO_EXECUTE_METHOD != invoke) { - if(invoke instanceof Boolean) { - return ((Boolean)invoke).booleanValue(); + if(invoke instanceof Boolean booleanInvoke) { + return booleanInvoke.booleanValue(); } return true; } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/AbstractLibraryInformationPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/AbstractLibraryInformationPart.java index d20656242c..4f61c29184 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/AbstractLibraryInformationPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/AbstractLibraryInformationPart.java @@ -43,11 +43,9 @@ protected boolean updateData(List objects, String topic) { Object object = objects.get(0); ILibraryInformation libraryInformation = null; // - if(object instanceof ILibraryMassSpectrum) { - ILibraryMassSpectrum libraryMassSpectrum = (ILibraryMassSpectrum)object; + if(object instanceof ILibraryMassSpectrum libraryMassSpectrum) { libraryInformation = libraryMassSpectrum.getLibraryInformation(); - } else if(object instanceof IIdentificationTarget) { - IIdentificationTarget identificationTarget = (IIdentificationTarget)object; + } else if(object instanceof IIdentificationTarget identificationTarget) { libraryInformation = identificationTarget.getLibraryInformation(); } // diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/ComparisonScanChartPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/ComparisonScanChartPart.java index a441b6eac8..86b81a4032 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/ComparisonScanChartPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/ComparisonScanChartPart.java @@ -59,13 +59,12 @@ protected boolean updateData(List objects, String topic) { if(isPeakUpdateEvent(topic) || isScanUpdateEvent(topic)) { IScanMSD scan = null; IIdentificationTarget identificationTarget = null; - if(object instanceof IScanMSD) { - scan = (IScanMSD)object; + if(object instanceof IScanMSD scanMSD) { + scan = scanMSD; float retentionIndex = scan.getRetentionIndex(); IdentificationTargetComparator identificationTargetComparator = new IdentificationTargetComparator(retentionIndex); identificationTarget = IIdentificationTarget.getBestIdentificationTarget(scan.getTargets(), identificationTargetComparator); - } else if(object instanceof IPeakMSD) { - IPeakMSD peakMSD = (IPeakMSD)object; + } else if(object instanceof IPeakMSD peakMSD) { scan = peakMSD.getExtractedMassSpectrum(); float retentionIndex = scan.getRetentionIndex(); IdentificationTargetComparator identificationTargetComparator = new IdentificationTargetComparator(retentionIndex); @@ -80,26 +79,20 @@ protected boolean updateData(List objects, String topic) { return true; } } else if(isScanTargetComparisonEvent(topic)) { - if(object instanceof Object[]) { - Object[] values = (Object[])object; + if(object instanceof Object[] values) { Object object1 = values[0]; Object object2 = values[1]; // - if(object1 instanceof IScanMSD && object2 instanceof IIdentificationTarget) { - IScanMSD unknownMassSpectrum = (IScanMSD)object1; - IIdentificationTarget identificationTarget = (IIdentificationTarget)object2; + if(object1 instanceof IScanMSD unknownMassSpectrum && object2 instanceof IIdentificationTarget identificationTarget) { getControl().update(unknownMassSpectrum, identificationTarget); } } } else if(isScanReferenceComparisonEvent(topic)) { - if(object instanceof Object[]) { - Object[] values = (Object[])object; + if(object instanceof Object[] values) { Object object1 = values[0]; Object object2 = values[1]; // - if(object1 instanceof IScanMSD && object2 instanceof IScanMSD) { - IScanMSD unknownMassSpectrum = (IScanMSD)object1; - IScanMSD referenceMassSpectrum = (IScanMSD)object2; + if(object1 instanceof IScanMSD unknownMassSpectrum && object2 instanceof IScanMSD referenceMassSpectrum) { getControl().update(unknownMassSpectrum, referenceMassSpectrum); } } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/EditHistoryPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/EditHistoryPart.java index d5edee540d..c785fd60f4 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/EditHistoryPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/EditHistoryPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2014, 2020 Lablicate GmbH. + * Copyright (c) 2014, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -45,13 +45,12 @@ protected boolean updateData(List objects, String topic) { Object object = objects.get(0); // if(isEditHistoryTopic(topic)) { - if(object instanceof IEditHistory) { - getControl().setInput((IEditHistory)object); + if(object instanceof IEditHistory editHistory) { + getControl().setInput(editHistory); return true; } } else if(isChromatogramTopic(topic)) { - if(object instanceof IChromatogramSelection) { - IChromatogramSelection chromatogramSelection = (IChromatogramSelection)object; + if(object instanceof IChromatogramSelection chromatogramSelection) { getControl().setInput(chromatogramSelection.getChromatogram().getEditHistory()); return true; } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/HeaderDataPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/HeaderDataPart.java index e393b67bbb..1e17d3a8c1 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/HeaderDataPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/HeaderDataPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2020 Lablicate GmbH. + * Copyright (c) 2017, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -37,8 +37,8 @@ public HeaderDataPart(Composite parent) { @Override public void update(Object object) { - if(object instanceof IMeasurementInfo) { - getControl().setInput((IMeasurementInfo)object); + if(object instanceof IMeasurementInfo measurementInfo) { + getControl().setInput(measurementInfo); } } }); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/InternalStandardsPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/InternalStandardsPart.java index 2ec700edf8..a27c58da6b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/InternalStandardsPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/InternalStandardsPart.java @@ -41,11 +41,9 @@ protected ExtendedInternalStandardsUI createControl(Composite parent) { protected boolean updateData(List objects, String topic) { if(objects.size() == 1) { - IPeak peak = null; if(isUpdateEvent(topic)) { Object object = objects.get(0); - if(object instanceof IPeak) { - peak = (IPeak)object; + if(object instanceof IPeak peak) { getControl().update(peak); return true; } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/MassSpectrumHeaderPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/MassSpectrumHeaderPart.java index afc55ad2fa..7170f06a59 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/MassSpectrumHeaderPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/MassSpectrumHeaderPart.java @@ -43,8 +43,8 @@ protected boolean updateData(List objects, String topic) { if(objects.size() == 1) { Object object = objects.get(0); - if(object instanceof IVendorMassSpectrum) { - getControl().updateMassSpectrum((IVendorMassSpectrum)object); + if(object instanceof IVendorMassSpectrum vendorMassSpectrum) { + getControl().updateMassSpectrum(vendorMassSpectrum); return true; } else { getControl().updateMassSpectrum(null); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/MassSpectrumOverlayPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/MassSpectrumOverlayPart.java index 23fe33f527..ab88a9375b 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/MassSpectrumOverlayPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/MassSpectrumOverlayPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2021 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -32,6 +32,7 @@ public MassSpectrumOverlayPart(Composite parent) { super(parent, TOPIC); } + @Override @Focus public void setFocus() { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/MeasurementResultsPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/MeasurementResultsPart.java index b6ac16178f..99dd9ae688 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/MeasurementResultsPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/MeasurementResultsPart.java @@ -57,8 +57,8 @@ protected ExtendedMeasurementResultUI createControl(Composite parent) { public void selectionChanged(SelectionChangedEvent event) { ISelection selection = event.getSelection(); - if(selection instanceof IStructuredSelection) { - Object element = ((IStructuredSelection)selection).getFirstElement(); + if(selection instanceof IStructuredSelection structuredSelection) { + Object element = structuredSelection.getFirstElement(); if(element instanceof IMeasurementResult) { measurementResultNotification.select((IMeasurementResult)element); } else { @@ -82,8 +82,7 @@ protected boolean updateData(List objects, String topic) { if(objects.size() == 1) { Object object = objects.get(0); if(isUpdateEvent(topic)) { - if(object instanceof IChromatogramSelection) { - IChromatogramSelection selection = (IChromatogramSelection)object; + if(object instanceof IChromatogramSelection selection) { IChromatogram chromatogram = selection.getChromatogram(); results = new ArrayList<>(chromatogram.getMeasurementResults()); infoLabel = ChromatogramDataSupport.getChromatogramLabel(chromatogram); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PeakChartPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PeakChartPart.java index 22498ae191..257332771f 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PeakChartPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PeakChartPart.java @@ -45,8 +45,8 @@ protected boolean updateData(List objects, String topic) { IPeak peak = null; // if(isUpdateEvent(topic)) { - if(object instanceof IPeak) { - peak = (IPeak)object; + if(object instanceof IPeak newPeak) { + peak = newPeak; } } // diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PeakDetailsPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PeakDetailsPart.java index 02f7e4e67d..bf49af57fe 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PeakDetailsPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PeakDetailsPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -44,8 +44,8 @@ protected boolean updateData(List objects, String topic) { IPeak peak = null; if(isUpdateEvent(topic)) { Object object = objects.get(0); - if(object instanceof IPeak) { - peak = (IPeak)object; + if(object instanceof IPeak newPeak) { + peak = newPeak; } } getControl().update(peak); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PeakQuantReferencesPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PeakQuantReferencesPart.java index da77f022cb..8868d67b01 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PeakQuantReferencesPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PeakQuantReferencesPart.java @@ -44,8 +44,8 @@ protected boolean updateData(List objects, String topic) { if(isUpdateEvent(topic)) { IPeak peak = null; Object object = objects.get(0); - if(object instanceof IPeak) { - peak = (IPeak)object; + if(object instanceof IPeak newPeak) { + peak = newPeak; } getControl().update(peak); } else if(isChromatogramTopic(topic)) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PeakTracesPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PeakTracesPart.java index ea2c57f978..790c50a38e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PeakTracesPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PeakTracesPart.java @@ -49,8 +49,8 @@ protected boolean updateData(List objects, String topic) { if(objects.size() == 1) { Object object = objects.get(0); if(isUpdateEvent(topic)) { - if(object instanceof IPeak) { - getControl().update((IPeak)object); + if(object instanceof IPeak peak) { + getControl().update(peak); return true; } } else if(isCloseEvent(topic)) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PenaltyCalculationPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PenaltyCalculationPart.java index a0fffe5233..1736dcd82d 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PenaltyCalculationPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PenaltyCalculationPart.java @@ -43,8 +43,8 @@ protected boolean updateData(List objects, String topic) { if(objects.size() == 1) { Object object = objects.get(0); if(isUpdateEvent(topic)) { - if(object instanceof IPeak) { - getControl().update((IPeak)object); + if(object instanceof IPeak peak) { + getControl().update(peak); return true; } } else if(isCloseEvent(topic)) { diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PlateChartsPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PlateChartsPart.java index 781a4efbf6..f50bcb8390 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PlateChartsPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PlateChartsPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -46,8 +46,8 @@ protected boolean updateData(List objects, String topic) { return false; } else { Object object = objects.get(0); - if(object instanceof IPlate) { - getControl().update((IPlate)object); + if(object instanceof IPlate plate) { + getControl().update(plate); return true; } else { getControl().update(null); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PlateDataPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PlateDataPart.java index 7c7b15c3ed..6dfdc7d8f8 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PlateDataPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/PlateDataPart.java @@ -46,8 +46,8 @@ protected boolean updateData(List objects, String topic) { return false; } else { Object object = objects.get(0); - if(object instanceof IPlate) { - getControl().update((IPlate)object); + if(object instanceof IPlate plate) { + getControl().update(plate); return true; } else { getControl().update(null); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantPeaksChartPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantPeaksChartPart.java index bb54ffaf7b..654239dc38 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantPeaksChartPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantPeaksChartPart.java @@ -42,8 +42,8 @@ protected boolean updateData(List objects, String topic) { if(objects.size() == 1) { Object object = objects.get(0); - if(object instanceof IQuantitationCompound) { - getControl().update((IQuantitationCompound)object); + if(object instanceof IQuantitationCompound quantitationCompound) { + getControl().update(quantitationCompound); return true; } else { getControl().update(null); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantPeaksListPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantPeaksListPart.java index 08995803d7..46226d1733 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantPeaksListPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantPeaksListPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -42,8 +42,8 @@ protected boolean updateData(List objects, String topic) { if(objects.size() == 1) { Object object = objects.get(0); - if(object instanceof IQuantitationCompound) { - getControl().update((IQuantitationCompound)object); + if(object instanceof IQuantitationCompound quantitationCompound) { + getControl().update(quantitationCompound); return true; } else { getControl().update(null); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantResponseChartPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantResponseChartPart.java index 915599a7a2..116149c8f5 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantResponseChartPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantResponseChartPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -42,8 +42,8 @@ protected boolean updateData(List objects, String topic) { if(objects.size() == 1) { Object object = objects.get(0); - if(object instanceof IQuantitationCompound) { - getControl().update((IQuantitationCompound)object); + if(object instanceof IQuantitationCompound quantitationCompound) { + getControl().update(quantitationCompound); return true; } else { getControl().update(null); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantResponseListPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantResponseListPart.java index ca3965da85..95f4f18e6f 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantResponseListPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantResponseListPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -42,8 +42,8 @@ protected boolean updateData(List objects, String topic) { if(objects.size() == 1) { Object object = objects.get(0); - if(object instanceof IQuantitationCompound) { - getControl().update((IQuantitationCompound)object); + if(object instanceof IQuantitationCompound quantitationCompound) { + getControl().update(quantitationCompound); return true; } else { getControl().update(null); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantSignalsListPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantSignalsListPart.java index fed0fdf446..db3c20b010 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantSignalsListPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/QuantSignalsListPart.java @@ -42,8 +42,8 @@ protected boolean updateData(List objects, String topic) { if(objects.size() == 1) { Object object = objects.get(0); - if(object instanceof IQuantitationCompound) { - getControl().update((IQuantitationCompound)object); + if(object instanceof IQuantitationCompound quantitationCompound) { + getControl().update(quantitationCompound); return true; } else { getControl().update(null); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/SubtractScanPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/SubtractScanPart.java index eae30a481c..2d6b9b7881 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/SubtractScanPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/SubtractScanPart.java @@ -43,8 +43,6 @@ protected ExtendedSubtractScanUI createControl(Composite parent) { @Override protected boolean updateData(List objects, String topic) { - System.out.println("Substract Scan: " + topic); - // if(objects.size() == 1) { if(isCloseEvent(topic)) { getControl().update(null); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/WellChannelsPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/WellChannelsPart.java index bf05033c13..e577fec29e 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/WellChannelsPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/WellChannelsPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2019, 2021 Lablicate GmbH. + * Copyright (c) 2019, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -47,8 +47,8 @@ protected boolean updateData(List objects, String topic) { return false; } else { Object object = objects.get(0); - if(object instanceof IWell) { - getControl().update((IWell)object); + if(object instanceof IWell well) { + getControl().update(well); return true; } else { getControl().update(null); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/WellChartPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/WellChartPart.java index 9203f001e9..a9d254d7c2 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/WellChartPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/WellChartPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2021 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -47,8 +47,8 @@ protected boolean updateData(List objects, String topic) { return false; } else { Object object = objects.get(0); - if(object instanceof IWell) { - getControl().update((IWell)object); + if(object instanceof IWell well) { + getControl().update(well); return true; } else { getControl().update(null); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/WellDataPart.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/WellDataPart.java index 25ff8588a2..ec591293bb 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/WellDataPart.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/parts/WellDataPart.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 Lablicate GmbH. + * Copyright (c) 2018, 2022 Lablicate GmbH. * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 @@ -46,8 +46,8 @@ protected boolean updateData(List objects, String topic) { return false; } else { Object object = objects.get(0); - if(object instanceof IWell) { - getControl().update((IWell)object); + if(object instanceof IWell well) { + getControl().update(well); return true; } else { getControl().update(null); diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/AbstractPreferencePageTask.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/AbstractPreferencePageTask.java index 156473a588..b09e95771c 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/AbstractPreferencePageTask.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/AbstractPreferencePageTask.java @@ -16,6 +16,8 @@ import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.LabelFieldEditor; import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.SpacerFieldEditor; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.toolbar.GroupHandler; import org.eclipse.chemclipse.ux.extension.xxd.ui.toolbar.IGroupHandler; import org.eclipse.chemclipse.ux.extension.xxd.ui.toolbar.IPartHandler; @@ -33,23 +35,24 @@ public AbstractPreferencePageTask(IGroupHandler groupHandler) { super(GRID); this.groupHandler = groupHandler; setPreferenceStore(Activator.getDefault().getPreferenceStore()); - setTitle(groupHandler != null ? groupHandler.getName() : "n.a."); + setTitle(groupHandler != null ? groupHandler.getName() : ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.NA)); setDescription(""); } + @Override public void createFieldEditors() { if(groupHandler != null) { - addField(new LabelFieldEditor("Mandatory", getFieldEditorParent())); + addField(new LabelFieldEditor(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.MANDATORY), getFieldEditorParent())); List partHandlersMandatory = groupHandler.getPartHandlerMandatory(); for(IPartHandler partHandler : partHandlersMandatory) { addField(new ComboFieldEditor(partHandler.getPartStackReference().getStackPositionKey(), partHandler.getName() + ":", PreferenceConstants.PART_STACKS, getFieldEditorParent())); } // List partHandlersAdditional = groupHandler.getPartHandlerAdditional(); - if(partHandlersAdditional.size() > 0) { + if(!partHandlersAdditional.isEmpty()) { addField(new SpacerFieldEditor(getFieldEditorParent())); - addField(new LabelFieldEditor("Additional", getFieldEditorParent())); + addField(new LabelFieldEditor(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.ADDITIONAL), getFieldEditorParent())); for(IPartHandler partHandler : partHandlersAdditional) { addField(new ComboFieldEditor(partHandler.getPartStackReference().getStackPositionKey(), partHandler.getName() + ":", PreferenceConstants.PART_STACKS, getFieldEditorParent())); } @@ -57,6 +60,7 @@ public void createFieldEditors() { } } + @Override public void init(IWorkbench workbench) { } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisIntensity.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisIntensity.java index adc37790d4..86703dfb87 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisIntensity.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisIntensity.java @@ -13,12 +13,15 @@ import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.SpinnerFieldEditor; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.ColorFieldEditor; import org.eclipse.jface.preference.ComboFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.StringFieldEditor; import org.eclipse.swt.widgets.Display; +import org.eclipse.swtchart.extensions.charts.ChartOptions; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; @@ -28,28 +31,28 @@ public ChromatogramAxisIntensity() { super(GRID); setPreferenceStore(Activator.getDefault().getPreferenceStore()); - setTitle("Chromatogram Intensity (Y Axis)"); + setTitle(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CHROMATOGRAM_INTENSITY_Y_AXIS)); setDescription(""); } @Override public void createFieldEditors() { - addField(new StringFieldEditor(PreferenceConstants.P_TITLE_Y_AXIS_INTENSITY, "Title:", getFieldEditorParent())); - addField(new StringFieldEditor(PreferenceConstants.P_FORMAT_Y_AXIS_INTENSITY, "Format:", getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_Y_AXIS_INTENSITY, "Show", getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_POSITION_Y_AXIS_INTENSITY, "Position:", PreferenceConstants.POSITIONS, getFieldEditorParent())); + addField(new StringFieldEditor(PreferenceConstants.P_TITLE_Y_AXIS_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TITLE) + ":", getFieldEditorParent())); + addField(new StringFieldEditor(PreferenceConstants.P_FORMAT_Y_AXIS_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FORMAT) + ":", getFieldEditorParent())); + addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_Y_AXIS_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SHOW), getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_POSITION_Y_AXIS_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.POSITION) + ":", ChartOptions.POSITIONS, getFieldEditorParent())); if(Display.isSystemDarkTheme()) { - addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_Y_AXIS_INTENSITY_DARKTHEME, "Color:", getFieldEditorParent())); + addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_Y_AXIS_INTENSITY_DARKTHEME, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COLOR) + ":", getFieldEditorParent())); } else { - addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_Y_AXIS_INTENSITY, "Color:", getFieldEditorParent())); + addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_Y_AXIS_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COLOR) + ":", getFieldEditorParent())); } - addField(new StringFieldEditor(PreferenceConstants.P_FONT_NAME_Y_AXIS_INTENSITY, "Font Name:", getFieldEditorParent())); - addField(new SpinnerFieldEditor(PreferenceConstants.P_FONT_SIZE_Y_AXIS_INTENSITY, "Font Size:", PreferenceConstants.MIN_FONT_SIZE, PreferenceConstants.MAX_FONT_SIZE, getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_FONT_STYLE_Y_AXIS_INTENSITY, "Font Style:", PreferenceConstants.FONT_STYLES, getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_GRIDLINE_STYLE_Y_AXIS_INTENSITY, "GridLine Style:", PreferenceConstants.LINE_STYLES, getFieldEditorParent())); - addField(new ColorFieldEditor(PreferenceConstants.P_GRIDLINE_COLOR_Y_AXIS_INTENSITY, "GridLine Color:", getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_Y_AXIS_TITLE_INTENSITY, "Show Axis Title", getFieldEditorParent())); + addField(new StringFieldEditor(PreferenceConstants.P_FONT_NAME_Y_AXIS_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FONT_NAME) + ":", getFieldEditorParent())); + addField(new SpinnerFieldEditor(PreferenceConstants.P_FONT_SIZE_Y_AXIS_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FONT_SIZE) + ":", PreferenceConstants.MIN_FONT_SIZE, PreferenceConstants.MAX_FONT_SIZE, getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_FONT_STYLE_Y_AXIS_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FONT_STYLE) + ":", ChartOptions.FONT_STYLES, getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_GRIDLINE_STYLE_Y_AXIS_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.GRID_LINE_STYLE) + ":", ChartOptions.LINE_STYLES, getFieldEditorParent())); + addField(new ColorFieldEditor(PreferenceConstants.P_GRIDLINE_COLOR_Y_AXIS_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.GRID_LINE_COLOR) + ":", getFieldEditorParent())); + addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_Y_AXIS_TITLE_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SHOW_AXIS_TITLE), getFieldEditorParent())); } @Override diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisMilliseconds.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisMilliseconds.java index 7987650656..61dfbd4049 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisMilliseconds.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisMilliseconds.java @@ -13,13 +13,15 @@ import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.SpinnerFieldEditor; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.ColorFieldEditor; import org.eclipse.jface.preference.ComboFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.StringFieldEditor; -import org.eclipse.swtchart.extensions.charts.ChartOptions; import org.eclipse.swt.widgets.Display; +import org.eclipse.swtchart.extensions.charts.ChartOptions; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; @@ -29,29 +31,29 @@ public ChromatogramAxisMilliseconds() { super(GRID); setPreferenceStore(Activator.getDefault().getPreferenceStore()); - setTitle("Chromatogram Milliseconds (X Axis)"); + setTitle(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CHROMATOGRAM_MILISECONDS_X_AXIS)); setDescription(""); } @Override public void createFieldEditors() { - addField(new StringFieldEditor(PreferenceConstants.P_TITLE_X_AXIS_MILLISECONDS, "Title:", getFieldEditorParent())); - addField(new StringFieldEditor(PreferenceConstants.P_FORMAT_X_AXIS_MILLISECONDS, "Format:", getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_MILLISECONDS, "Show ", getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_POSITION_X_AXIS_MILLISECONDS, "Position:", ChartOptions.POSITIONS, getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_POSITION_X_AXIS_MILLISECONDS, "Position:", PreferenceConstants.POSITIONS, getFieldEditorParent())); + addField(new StringFieldEditor(PreferenceConstants.P_TITLE_X_AXIS_MILLISECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TITLE) + ":", getFieldEditorParent())); + addField(new StringFieldEditor(PreferenceConstants.P_FORMAT_X_AXIS_MILLISECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FORMAT) + ":", getFieldEditorParent())); + addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_MILLISECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SHOW), getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_POSITION_X_AXIS_MILLISECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.POSITION) + ":", ChartOptions.POSITIONS, getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_POSITION_X_AXIS_MILLISECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.POSITION) + ":", PreferenceConstants.POSITIONS, getFieldEditorParent())); if(Display.isSystemDarkTheme()) { - addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_X_AXIS_MILLISECONDS_DARKTHEME, "Color:", getFieldEditorParent())); + addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_X_AXIS_MILLISECONDS_DARKTHEME, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COLOR) + ":", getFieldEditorParent())); } else { - addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_X_AXIS_MILLISECONDS, "Color:", getFieldEditorParent())); + addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_X_AXIS_MILLISECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COLOR) + ":", getFieldEditorParent())); } - addField(new StringFieldEditor(PreferenceConstants.P_FONT_NAME_X_AXIS_MILLISECONDS, "Font Name:", getFieldEditorParent())); - addField(new SpinnerFieldEditor(PreferenceConstants.P_FONT_SIZE_X_AXIS_MILLISECONDS, "Font Size:", PreferenceConstants.MIN_FONT_SIZE, PreferenceConstants.MAX_FONT_SIZE, getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_FONT_STYLE_X_AXIS_MILLISECONDS, "Font Style:", ChartOptions.FONT_STYLES, getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_GRIDLINE_STYLE_X_AXIS_MILLISECONDS, "GridLine Style:", ChartOptions.LINE_STYLES, getFieldEditorParent())); - addField(new ColorFieldEditor(PreferenceConstants.P_GRIDLINE_COLOR_X_AXIS_MILLISECONDS, "GridLine Color:", getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_TITLE_MILLISECONDS, "Show Axis Title", getFieldEditorParent())); + addField(new StringFieldEditor(PreferenceConstants.P_FONT_NAME_X_AXIS_MILLISECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FONT_NAME) + ":", getFieldEditorParent())); + addField(new SpinnerFieldEditor(PreferenceConstants.P_FONT_SIZE_X_AXIS_MILLISECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FONT_SIZE) + ":", PreferenceConstants.MIN_FONT_SIZE, PreferenceConstants.MAX_FONT_SIZE, getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_FONT_STYLE_X_AXIS_MILLISECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FONT_STYLE) + ":", ChartOptions.FONT_STYLES, getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_GRIDLINE_STYLE_X_AXIS_MILLISECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.GRID_LINE_STYLE) + ":", ChartOptions.LINE_STYLES, getFieldEditorParent())); + addField(new ColorFieldEditor(PreferenceConstants.P_GRIDLINE_COLOR_X_AXIS_MILLISECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.GRID_LINE_COLOR) + ":", getFieldEditorParent())); + addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_TITLE_MILLISECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SHOW_AXIS_TITLE) + ":", getFieldEditorParent())); } @Override diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisMinutes.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisMinutes.java index 1d24b38fa7..76fb8dc9c9 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisMinutes.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisMinutes.java @@ -13,12 +13,15 @@ import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.SpinnerFieldEditor; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.ColorFieldEditor; import org.eclipse.jface.preference.ComboFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.StringFieldEditor; import org.eclipse.swt.widgets.Display; +import org.eclipse.swtchart.extensions.charts.ChartOptions; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; @@ -28,30 +31,30 @@ public ChromatogramAxisMinutes() { super(GRID); setPreferenceStore(Activator.getDefault().getPreferenceStore()); - setTitle("Chromatogram Minutes (X Axis)"); + setTitle(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CHROMATOGRAM_MINUTES_X_AXIS)); setDescription(""); } @Override public void createFieldEditors() { - addField(new StringFieldEditor(PreferenceConstants.P_TITLE_X_AXIS_MINUTES, "Title:", getFieldEditorParent())); - addField(new StringFieldEditor(PreferenceConstants.P_FORMAT_X_AXIS_MINUTES, "Format:", getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_MINUTES, "Show", getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_POSITION_X_AXIS_MINUTES, "Position:", PreferenceConstants.POSITIONS, getFieldEditorParent())); + addField(new StringFieldEditor(PreferenceConstants.P_TITLE_X_AXIS_MINUTES, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TITLE) + ":", getFieldEditorParent())); + addField(new StringFieldEditor(PreferenceConstants.P_FORMAT_X_AXIS_MINUTES, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FORMAT) + ":", getFieldEditorParent())); + addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_MINUTES, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SHOW), getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_POSITION_X_AXIS_MINUTES, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.POSITION) + ":", PreferenceConstants.POSITIONS, getFieldEditorParent())); if(Display.isSystemDarkTheme()) { - addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_X_AXIS_MINUTES_DARKTHEME, "Color:", getFieldEditorParent())); + addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_X_AXIS_MINUTES_DARKTHEME, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COLOR) + ":", getFieldEditorParent())); } else { - addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_X_AXIS_MINUTES, "Color:", getFieldEditorParent())); + addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_X_AXIS_MINUTES, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COLOR) + ":", getFieldEditorParent())); } - addField(new StringFieldEditor(PreferenceConstants.P_FONT_NAME_X_AXIS_MINUTES, "Font Name:", getFieldEditorParent())); - addField(new SpinnerFieldEditor(PreferenceConstants.P_FONT_SIZE_X_AXIS_MINUTES, "Font Size:", PreferenceConstants.MIN_FONT_SIZE, PreferenceConstants.MAX_FONT_SIZE, getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_FONT_STYLE_X_AXIS_MINUTES, "Font Style:", PreferenceConstants.FONT_STYLES, getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_GRIDLINE_STYLE_X_AXIS_MINUTES, "GridLine Style:", PreferenceConstants.LINE_STYLES, getFieldEditorParent())); - addField(new ColorFieldEditor(PreferenceConstants.P_GRIDLINE_COLOR_X_AXIS_MINUTES, "GridLine Color:", getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_TITLE_MINUTES, "Show Axis Title", getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_LINE_MINUTES, "Show Axis Line", getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_POSITION_MARKER_MINUTES, "Show Axis Position Marker", getFieldEditorParent())); + addField(new StringFieldEditor(PreferenceConstants.P_FONT_NAME_X_AXIS_MINUTES, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FONT_NAME) + ":", getFieldEditorParent())); + addField(new SpinnerFieldEditor(PreferenceConstants.P_FONT_SIZE_X_AXIS_MINUTES, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FONT_SIZE) + ":", PreferenceConstants.MIN_FONT_SIZE, PreferenceConstants.MAX_FONT_SIZE, getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_FONT_STYLE_X_AXIS_MINUTES, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FONT_STYLE) + ":", PreferenceConstants.FONT_STYLES, getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_GRIDLINE_STYLE_X_AXIS_MINUTES, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.GRID_LINE_STYLE) + ":", ChartOptions.LINE_STYLES, getFieldEditorParent())); + addField(new ColorFieldEditor(PreferenceConstants.P_GRIDLINE_COLOR_X_AXIS_MINUTES, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.GRID_LINE_COLOR) + ":", getFieldEditorParent())); + addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_TITLE_MINUTES, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SHOW_AXIS_TITLE), getFieldEditorParent())); + addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_LINE_MINUTES, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SHOW_AXIS_LINE), getFieldEditorParent())); + addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_POSITION_MARKER_MINUTES, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SHOW_AXIS_POSITION_MARKER), getFieldEditorParent())); } @Override diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisRelativeIntensity.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisRelativeIntensity.java index 66a4166476..ef747f4159 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisRelativeIntensity.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisRelativeIntensity.java @@ -13,12 +13,15 @@ import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.SpinnerFieldEditor; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.ColorFieldEditor; import org.eclipse.jface.preference.ComboFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.StringFieldEditor; import org.eclipse.swt.widgets.Display; +import org.eclipse.swtchart.extensions.charts.ChartOptions; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; @@ -35,21 +38,21 @@ public ChromatogramAxisRelativeIntensity() { @Override public void createFieldEditors() { - addField(new StringFieldEditor(PreferenceConstants.P_TITLE_Y_AXIS_RELATIVE_INTENSITY, "Title:", getFieldEditorParent())); - addField(new StringFieldEditor(PreferenceConstants.P_FORMAT_Y_AXIS_RELATIVE_INTENSITY, "Format:", getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_Y_AXIS_RELATIVE_INTENSITY, "Show", getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_POSITION_Y_AXIS_RELATIVE_INTENSITY, "Position:", PreferenceConstants.POSITIONS, getFieldEditorParent())); + addField(new StringFieldEditor(PreferenceConstants.P_TITLE_Y_AXIS_RELATIVE_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TITLE) + ":", getFieldEditorParent())); + addField(new StringFieldEditor(PreferenceConstants.P_FORMAT_Y_AXIS_RELATIVE_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FORMAT) + ":", getFieldEditorParent())); + addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_Y_AXIS_RELATIVE_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SHOW), getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_POSITION_Y_AXIS_RELATIVE_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.POSITION) + ":", ChartOptions.POSITIONS, getFieldEditorParent())); if(Display.isSystemDarkTheme()) { - addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_Y_AXIS_RELATIVE_INTENSITY_DARKTHEME, "Color:", getFieldEditorParent())); + addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_Y_AXIS_RELATIVE_INTENSITY_DARKTHEME, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COLOR) + ":", getFieldEditorParent())); } else { - addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_Y_AXIS_RELATIVE_INTENSITY, "Color:", getFieldEditorParent())); + addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_Y_AXIS_RELATIVE_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COLOR) + ":", getFieldEditorParent())); } - addField(new StringFieldEditor(PreferenceConstants.P_FONT_NAME_Y_AXIS_RELATIVE_INTENSITY, "Font Name:", getFieldEditorParent())); - addField(new SpinnerFieldEditor(PreferenceConstants.P_FONT_SIZE_Y_AXIS_RELATIVE_INTENSITY, "Font Size:", PreferenceConstants.MIN_FONT_SIZE, PreferenceConstants.MAX_FONT_SIZE, getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_FONT_STYLE_Y_AXIS_RELATIVE_INTENSITY, "Font Style:", PreferenceConstants.FONT_STYLES, getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_GRIDLINE_STYLE_Y_AXIS_RELATIVE_INTENSITY, "GridLine Style:", PreferenceConstants.LINE_STYLES, getFieldEditorParent())); - addField(new ColorFieldEditor(PreferenceConstants.P_GRIDLINE_COLOR_Y_AXIS_RELATIVE_INTENSITY, "GridLine Color:", getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_Y_AXIS_TITLE_RELATIVE_INTENSITY, "Show Axis Title", getFieldEditorParent())); + addField(new StringFieldEditor(PreferenceConstants.P_FONT_NAME_Y_AXIS_RELATIVE_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FONT_NAME) + ":", getFieldEditorParent())); + addField(new SpinnerFieldEditor(PreferenceConstants.P_FONT_SIZE_Y_AXIS_RELATIVE_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FONT_SIZE) + ":", PreferenceConstants.MIN_FONT_SIZE, PreferenceConstants.MAX_FONT_SIZE, getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_FONT_STYLE_Y_AXIS_RELATIVE_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FONT_STYLE) + ":", ChartOptions.FONT_STYLES, getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_GRIDLINE_STYLE_Y_AXIS_RELATIVE_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.GRID_LINE_STYLE) + ":", ChartOptions.LINE_STYLES, getFieldEditorParent())); + addField(new ColorFieldEditor(PreferenceConstants.P_GRIDLINE_COLOR_Y_AXIS_RELATIVE_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.GRID_LINE_COLOR) + ":", getFieldEditorParent())); + addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_Y_AXIS_TITLE_RELATIVE_INTENSITY, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SHOW_AXIS_TITLE), getFieldEditorParent())); } @Override diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisScans.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisScans.java index b26a7d5d84..5a4afdb6f7 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisScans.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisScans.java @@ -13,6 +13,8 @@ import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.SpinnerFieldEditor; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.ColorFieldEditor; import org.eclipse.jface.preference.ComboFieldEditor; @@ -29,28 +31,28 @@ public ChromatogramAxisScans() { super(GRID); setPreferenceStore(Activator.getDefault().getPreferenceStore()); - setTitle("Chromatogram Scans (X Axis)"); + setTitle(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CHROMATOGRAM_SCANS_X_AXIS)); setDescription(""); } @Override public void createFieldEditors() { - addField(new StringFieldEditor(PreferenceConstants.P_TITLE_X_AXIS_SCANS, "Title:", getFieldEditorParent())); - addField(new StringFieldEditor(PreferenceConstants.P_FORMAT_X_AXIS_SCANS, "Format:", getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_SCANS, "Show", getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_POSITION_X_AXIS_SCANS, "Position:", ChartOptions.POSITIONS, getFieldEditorParent())); + addField(new StringFieldEditor(PreferenceConstants.P_TITLE_X_AXIS_SCANS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TITLE) + ":", getFieldEditorParent())); + addField(new StringFieldEditor(PreferenceConstants.P_FORMAT_X_AXIS_SCANS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FORMAT) + ":", getFieldEditorParent())); + addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_SCANS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SHOW), getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_POSITION_X_AXIS_SCANS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.POSITION) + ":", ChartOptions.POSITIONS, getFieldEditorParent())); if(Display.isSystemDarkTheme()) { - addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_X_AXIS_SCANS_DARKTHEME, "Color:", getFieldEditorParent())); + addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_X_AXIS_SCANS_DARKTHEME, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COLOR) + ":", getFieldEditorParent())); } else { - addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_X_AXIS_SCANS, "Color:", getFieldEditorParent())); + addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_X_AXIS_SCANS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COLOR) + ":", getFieldEditorParent())); } - addField(new StringFieldEditor(PreferenceConstants.P_FONT_NAME_X_AXIS_SCANS, "Font Name:", getFieldEditorParent())); - addField(new SpinnerFieldEditor(PreferenceConstants.P_FONT_SIZE_X_AXIS_SCANS, "Font Size:", PreferenceConstants.MIN_FONT_SIZE, PreferenceConstants.MAX_FONT_SIZE, getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_FONT_STYLE_X_AXIS_SCANS, "Font Style:", ChartOptions.FONT_STYLES, getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_GRIDLINE_STYLE_X_AXIS_SCANS, "GridLine Style:", ChartOptions.LINE_STYLES, getFieldEditorParent())); - addField(new ColorFieldEditor(PreferenceConstants.P_GRIDLINE_COLOR_X_AXIS_SCANS, "GridLine Color:", getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_TITLE_SCANS, "Show Axis Title", getFieldEditorParent())); + addField(new StringFieldEditor(PreferenceConstants.P_FONT_NAME_X_AXIS_SCANS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FONT_NAME) + ":", getFieldEditorParent())); + addField(new SpinnerFieldEditor(PreferenceConstants.P_FONT_SIZE_X_AXIS_SCANS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FONT_SIZE) + ":", PreferenceConstants.MIN_FONT_SIZE, PreferenceConstants.MAX_FONT_SIZE, getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_FONT_STYLE_X_AXIS_SCANS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FONT_STYLE) + ":", ChartOptions.FONT_STYLES, getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_GRIDLINE_STYLE_X_AXIS_SCANS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.GRID_LINE_STYLE) + ":", ChartOptions.LINE_STYLES, getFieldEditorParent())); + addField(new ColorFieldEditor(PreferenceConstants.P_GRIDLINE_COLOR_X_AXIS_SCANS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.GRID_LINE_COLOR) + ":", getFieldEditorParent())); + addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_TITLE_SCANS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SHOW_AXIS_TITLE), getFieldEditorParent())); } @Override diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisSeconds.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisSeconds.java index 40cffaf0ef..baecc78378 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisSeconds.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/ChromatogramAxisSeconds.java @@ -13,12 +13,15 @@ import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.SpinnerFieldEditor; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.ColorFieldEditor; import org.eclipse.jface.preference.ComboFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; import org.eclipse.jface.preference.StringFieldEditor; import org.eclipse.swt.widgets.Display; +import org.eclipse.swtchart.extensions.charts.ChartOptions; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; @@ -28,28 +31,28 @@ public ChromatogramAxisSeconds() { super(GRID); setPreferenceStore(Activator.getDefault().getPreferenceStore()); - setTitle("Chromatogram Seconds (X Axis)"); + setTitle(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CHROMATOGRAM_SECONDS_X_AXIS)); setDescription(""); } @Override public void createFieldEditors() { - addField(new StringFieldEditor(PreferenceConstants.P_TITLE_X_AXIS_SECONDS, "Title:", getFieldEditorParent())); - addField(new StringFieldEditor(PreferenceConstants.P_FORMAT_X_AXIS_SECONDS, "Format:", getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_SECONDS, "Show", getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_POSITION_X_AXIS_SECONDS, "Position:", PreferenceConstants.POSITIONS, getFieldEditorParent())); + addField(new StringFieldEditor(PreferenceConstants.P_TITLE_X_AXIS_SECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TITLE) + ":", getFieldEditorParent())); + addField(new StringFieldEditor(PreferenceConstants.P_FORMAT_X_AXIS_SECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FORMAT) + ":", getFieldEditorParent())); + addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_SECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SHOW), getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_POSITION_X_AXIS_SECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.POSITION) + ":", PreferenceConstants.POSITIONS, getFieldEditorParent())); if(Display.isSystemDarkTheme()) { - addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_X_AXIS_SECONDS_DARKTHEME, "Color:", getFieldEditorParent())); + addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_X_AXIS_SECONDS_DARKTHEME, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COLOR) + ":", getFieldEditorParent())); } else { - addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_X_AXIS_SECONDS, "Color:", getFieldEditorParent())); + addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_X_AXIS_SECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COLOR) + ":", getFieldEditorParent())); } - addField(new StringFieldEditor(PreferenceConstants.P_FONT_NAME_X_AXIS_SECONDS, "Font Name:", getFieldEditorParent())); - addField(new SpinnerFieldEditor(PreferenceConstants.P_FONT_SIZE_X_AXIS_SECONDS, "Font Size:", PreferenceConstants.MIN_FONT_SIZE, PreferenceConstants.MAX_FONT_SIZE, getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_FONT_STYLE_X_AXIS_SECONDS, "Font Style:", PreferenceConstants.FONT_STYLES, getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_GRIDLINE_STYLE_X_AXIS_SECONDS, "GridLine Style:", PreferenceConstants.LINE_STYLES, getFieldEditorParent())); - addField(new ColorFieldEditor(PreferenceConstants.P_GRIDLINE_COLOR_X_AXIS_SECONDS, "GridLine Color:", getFieldEditorParent())); - addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_TITLE_SECONDS, "Show Axis Title", getFieldEditorParent())); + addField(new StringFieldEditor(PreferenceConstants.P_FONT_NAME_X_AXIS_SECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FONT_NAME) + ":", getFieldEditorParent())); + addField(new SpinnerFieldEditor(PreferenceConstants.P_FONT_SIZE_X_AXIS_SECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FONT_SIZE) + ":", PreferenceConstants.MIN_FONT_SIZE, PreferenceConstants.MAX_FONT_SIZE, getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_FONT_STYLE_X_AXIS_SECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.FONT_STYLE) + ":", ChartOptions.FONT_STYLES, getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_GRIDLINE_STYLE_X_AXIS_SECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.GRID_LINE_STYLE) + ":", ChartOptions.LINE_STYLES, getFieldEditorParent())); + addField(new ColorFieldEditor(PreferenceConstants.P_GRIDLINE_COLOR_X_AXIS_SECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.GRID_LINE_COLOR) + ":", getFieldEditorParent())); + addField(new BooleanFieldEditor(PreferenceConstants.P_SHOW_X_AXIS_TITLE_SECONDS, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.SHOW_AXIS_TITLE), getFieldEditorParent())); } @Override diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/PreferenceConstants.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/PreferenceConstants.java index 797ca46855..29228952e7 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/PreferenceConstants.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/PreferenceConstants.java @@ -19,6 +19,8 @@ import org.eclipse.chemclipse.swt.ui.support.Colors; import org.eclipse.chemclipse.ux.extension.ui.support.PartSupport; import org.eclipse.chemclipse.ux.extension.xxd.ui.editors.ChromatogramEditorTSD; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.model.TracesExportOption; import org.eclipse.swt.SWT; import org.eclipse.swtchart.IAxis.Position; @@ -31,12 +33,12 @@ public class PreferenceConstants extends ChartOptions { public static final String[][] PART_STACKS = new String[][]{ // {"--", PartSupport.PARTSTACK_NONE}, // - {"Left Top", PartSupport.PARTSTACK_LEFT_TOP}, // - {"Left Center", PartSupport.PARTSTACK_LEFT_CENTER}, // - {"Right Top", PartSupport.PARTSTACK_RIGHT_TOP}, // - {"Bottom Left", PartSupport.PARTSTACK_BOTTOM_LEFT}, // - {"Bottom Center", PartSupport.PARTSTACK_BOTTOM_CENTER}, // - {"Bottom Right", PartSupport.PARTSTACK_BOTTOM_RIGHT}// + {ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.LEFT_TOP), PartSupport.PARTSTACK_LEFT_TOP}, // + {ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.LEFT_CENTER), PartSupport.PARTSTACK_LEFT_CENTER}, // + {ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.RIGHT_TOP), PartSupport.PARTSTACK_RIGHT_TOP}, // + {ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.BOTTOM_LEFT), PartSupport.PARTSTACK_BOTTOM_LEFT}, // + {ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.BOTTOM_CENTER), PartSupport.PARTSTACK_BOTTOM_CENTER}, // + {ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.BOTTOM_RIGHT), PartSupport.PARTSTACK_BOTTOM_RIGHT}// }; // public static final int MIN_SYMBOL_SIZE = 1; diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/PreferencePage.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/PreferencePage.java index 6e7cc2cfbb..71a6303958 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/PreferencePage.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/PreferencePage.java @@ -13,6 +13,8 @@ import org.eclipse.chemclipse.processing.converter.ISupplierFileIdentifier; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.chemclipse.ux.extension.xxd.ui.services.EditorServicesSupport; import org.eclipse.jface.preference.ComboFieldEditor; import org.eclipse.jface.preference.DirectoryFieldEditor; @@ -30,12 +32,14 @@ public PreferencePage() { setDescription(""); } + @Override public void createFieldEditors() { - addField(new DirectoryFieldEditor(PreferenceConstants.P_TIME_RANGE_TEMPLATE_FOLDER, "Time Range Path", getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_EDITOR_TSD, "Editor TSD", EditorServicesSupport.getAvailableEditors(ISupplierFileIdentifier.TYPE_TSD), getFieldEditorParent())); + addField(new DirectoryFieldEditor(PreferenceConstants.P_TIME_RANGE_TEMPLATE_FOLDER, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.TIME_RANGE_PATH), getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_EDITOR_TSD, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.EDITOR_TSD), EditorServicesSupport.getAvailableEditors(ISupplierFileIdentifier.TYPE_TSD), getFieldEditorParent())); } + @Override public void init(IWorkbench workbench) { } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/PreferencePageBaseline.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/PreferencePageBaseline.java index 14df546985..954f6142ea 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/PreferencePageBaseline.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/PreferencePageBaseline.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2017, 2018 Lablicate GmbH. + * Copyright (c) 2017, 2022 Lablicate GmbH. * * All rights reserved. * This program and the accompanying materials are made available under the @@ -13,26 +13,32 @@ import org.eclipse.chemclipse.swt.ui.support.Colors; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.jface.preference.ComboFieldEditor; import org.eclipse.jface.preference.FieldEditorPreferencePage; +import org.eclipse.swtchart.extensions.charts.ChartOptions; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPreferencePage; public class PreferencePageBaseline extends FieldEditorPreferencePage implements IWorkbenchPreferencePage { public PreferencePageBaseline() { + super(GRID); setPreferenceStore(Activator.getDefault().getPreferenceStore()); - setTitle("Baseline"); + setTitle(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.BASELINE)); setDescription(""); } + @Override public void createFieldEditors() { - addField(new ComboFieldEditor(PreferenceConstants.P_BASELINE_CHART_COMPRESSION_TYPE, "Compression Type:", PreferenceConstants.COMPRESSION_TYPES, getFieldEditorParent())); - addField(new ComboFieldEditor(PreferenceConstants.P_COLOR_SCHEME_DISPLAY_BASELINE, "Display Color Scheme", Colors.getAvailableColorSchemes(), getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_BASELINE_CHART_COMPRESSION_TYPE, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COMPRESSION_TYPE), ChartOptions.COMPRESSION_TYPES, getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_COLOR_SCHEME_DISPLAY_BASELINE, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.DISPLAY_COLOR_SCHEME), Colors.getAvailableColorSchemes(), getFieldEditorParent())); } + @Override public void init(IWorkbench workbench) { } diff --git a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/PreferencePageChromatogram.java b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/PreferencePageChromatogram.java index 4a132fee2b..6ebf8bff33 100644 --- a/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/PreferencePageChromatogram.java +++ b/chemclipse/plugins/org.eclipse.chemclipse.ux.extension.xxd.ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/preferences/PreferencePageChromatogram.java @@ -17,6 +17,8 @@ import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.LabelFieldEditor; import org.eclipse.chemclipse.support.ui.preferences.fieldeditors.SpacerFieldEditor; import org.eclipse.chemclipse.ux.extension.xxd.ui.Activator; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.ExtensionMessages; +import org.eclipse.chemclipse.ux.extension.xxd.ui.messages.IExtensionMessages; import org.eclipse.jface.preference.BooleanFieldEditor; import org.eclipse.jface.preference.ColorFieldEditor; import org.eclipse.jface.preference.ComboFieldEditor; @@ -34,14 +36,14 @@ public PreferencePageChromatogram() { super(GRID); setPreferenceStore(Activator.getDefault().getPreferenceStore()); - setTitle("Chromatogram"); + setTitle(ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.CHROMATOGRAM)); setDescription(""); } @Override public void createFieldEditors() { - addField(new ComboFieldEditor(PreferenceConstants.P_CHROMATOGRAM_CHART_COMPRESSION_TYPE, "Compression Type:", PreferenceConstants.COMPRESSION_TYPES, getFieldEditorParent())); + addField(new ComboFieldEditor(PreferenceConstants.P_CHROMATOGRAM_CHART_COMPRESSION_TYPE, ExtensionMessages.INSTANCE().getMessage(IExtensionMessages.COMPRESSION_TYPE) + ":", PreferenceConstants.COMPRESSION_TYPES, getFieldEditorParent())); addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_CHROMATOGRAM, "Color Chromatogram:", getFieldEditorParent())); addField(new ColorFieldEditor(PreferenceConstants.P_COLOR_CHROMATOGRAM_INACTIVE, "Color Chromatogram (Inactive):", getFieldEditorParent())); addField(new BooleanFieldEditor(PreferenceConstants.P_ENABLE_CHROMATOGRAM_AREA, "Enable Chromatogram Area", getFieldEditorParent()));