diff --git a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java index 7535793ff2c..0b2036484d1 100644 --- a/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java +++ b/rse/plugins/org.eclipse.rse.core/src/org/eclipse/rse/core/model/ISystemRegistry.java @@ -11,7 +11,7 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core ********************************************************************************/ package org.eclipse.rse.core.model; diff --git a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/IUniversalDataStoreConstants.java b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/IUniversalDataStoreConstants.java index 77e0b3de06b..6f551389fe3 100644 --- a/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/IUniversalDataStoreConstants.java +++ b/rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/dstore/universal/miners/IUniversalDataStoreConstants.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2002, 2007 IBM Corporation and others. 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 @@ -11,18 +11,13 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [183165] Do not implement constant interfaces ********************************************************************************/ package org.eclipse.rse.dstore.universal.miners; -import org.eclipse.rse.services.clientserver.IServiceConstants; - -public interface IUniversalDataStoreConstants extends IServiceConstants +public interface IUniversalDataStoreConstants { - - - /* * Miner names, used for logging */ diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemEditPaneStateMachine.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemEditPaneStateMachine.java index 3dba90a5389..ebea58ec15d 100644 --- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemEditPaneStateMachine.java +++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/widgets/SystemEditPaneStateMachine.java @@ -1,5 +1,5 @@ /******************************************************************************** - * Copyright (c) 2002, 2006 IBM Corporation. All rights reserved. + * Copyright (c) 2002, 2007 IBM Corporation and others. 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 @@ -11,7 +11,7 @@ * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * * Contributors: - * {Name} (company) - description of contribution. + * Martin Oberhuber (Wind River) - [183165] Do not implement constant interfaces ********************************************************************************/ package org.eclipse.rse.ui.widgets; @@ -58,8 +58,7 @@ import org.eclipse.swt.widgets.Composite; *
  • {@link #resetPressed()} -> when user successfully presses reset * */ -public class SystemEditPaneStateMachine implements ISystemEditPaneStates - //, SelectionListener +public class SystemEditPaneStateMachine { // state private Composite composite; @@ -131,9 +130,9 @@ public class SystemEditPaneStateMachine implements ISystemEditPaneStates */ public void setNewMode() { - setButtonText(mode, MODE_NEW); - setMode(MODE_NEW); - setState(STATE_INITIAL); + setButtonText(mode, ISystemEditPaneStates.MODE_NEW); + setMode(ISystemEditPaneStates.MODE_NEW); + setState(ISystemEditPaneStates.STATE_INITIAL); enableButtons(); if (!composite.isVisible()) composite.setVisible(true); @@ -144,9 +143,9 @@ public class SystemEditPaneStateMachine implements ISystemEditPaneStates */ public void setEditMode() { - setButtonText(mode, MODE_EDIT); - setMode(MODE_EDIT); - setState(STATE_INITIAL); + setButtonText(mode, ISystemEditPaneStates.MODE_EDIT); + setMode(ISystemEditPaneStates.MODE_EDIT); + setState(ISystemEditPaneStates.STATE_INITIAL); enableButtons(); if (!composite.isVisible()) composite.setVisible(true); @@ -157,9 +156,9 @@ public class SystemEditPaneStateMachine implements ISystemEditPaneStates */ public void setUnsetMode() { - setButtonText(mode, MODE_UNSET); - setMode(MODE_UNSET); - setState(STATE_INITIAL); + setButtonText(mode, ISystemEditPaneStates.MODE_UNSET); + setMode(ISystemEditPaneStates.MODE_UNSET); + setState(ISystemEditPaneStates.STATE_INITIAL); enableButtons(); if (composite.isVisible()) composite.setVisible(false); @@ -170,7 +169,7 @@ public class SystemEditPaneStateMachine implements ISystemEditPaneStates */ public void setChangesMade() { - setState(STATE_PENDING); + setState(ISystemEditPaneStates.STATE_PENDING); enableButtons(); } /** @@ -193,7 +192,7 @@ public class SystemEditPaneStateMachine implements ISystemEditPaneStates } catch (Exception exc) {} } //if (!changesPending) // user has made decision, so clear state - setState(STATE_INITIAL); // one way or another, decision has been made + setState(ISystemEditPaneStates.STATE_INITIAL); // one way or another, decision has been made return changesPending; } @@ -202,7 +201,7 @@ public class SystemEditPaneStateMachine implements ISystemEditPaneStates */ public void applyPressed() { - setState(STATE_APPLIED); + setState(ISystemEditPaneStates.STATE_APPLIED); enableButtons(); } /** @@ -210,7 +209,7 @@ public class SystemEditPaneStateMachine implements ISystemEditPaneStates */ public void resetPressed() { - setState(STATE_INITIAL); + setState(ISystemEditPaneStates.STATE_INITIAL); enableButtons(); } @@ -219,7 +218,7 @@ public class SystemEditPaneStateMachine implements ISystemEditPaneStates */ public boolean areChangesPending() { - return (state == STATE_PENDING); + return (state == ISystemEditPaneStates.STATE_PENDING); } // ----------------------------------- @@ -289,15 +288,15 @@ public class SystemEditPaneStateMachine implements ISystemEditPaneStates boolean enableReset = false; switch(state) { - case STATE_INITIAL: + case ISystemEditPaneStates.STATE_INITIAL: enableApply = false; enableReset = false; break; - case STATE_APPLIED: + case ISystemEditPaneStates.STATE_APPLIED: enableApply = false; enableReset = false; // true; only true if reset returns to pre-applied values. Not usually the case break; - case STATE_PENDING: + case ISystemEditPaneStates.STATE_PENDING: enableApply = true; enableReset = true; break; @@ -315,7 +314,7 @@ public class SystemEditPaneStateMachine implements ISystemEditPaneStates { if (oldMode != newMode) { - if ((newMode == MODE_NEW) && applyLabelMode) + if ((newMode == ISystemEditPaneStates.MODE_NEW) && applyLabelMode) { applyButton.setText(applyLabel_newMode); applyButton.setToolTipText(applyTip_newMode); @@ -331,7 +330,7 @@ public class SystemEditPaneStateMachine implements ISystemEditPaneStates //} } } - else if ((newMode == MODE_EDIT) && !applyLabelMode) + else if ((newMode == ISystemEditPaneStates.MODE_EDIT) && !applyLabelMode) { applyButton.setText(applyLabel_applyMode); applyButton.setToolTipText(applyTip_applyMode); @@ -426,24 +425,24 @@ public class SystemEditPaneStateMachine implements ISystemEditPaneStates { switch(backupMode) { - case MODE_UNSET: + case ISystemEditPaneStates.MODE_UNSET: setUnsetMode(); break; - case MODE_NEW: + case ISystemEditPaneStates.MODE_NEW: setNewMode(); break; - case MODE_EDIT: + case ISystemEditPaneStates.MODE_EDIT: setEditMode(); break; } switch(backupState) { - case STATE_PENDING: + case ISystemEditPaneStates.STATE_PENDING: setChangesMade(); break; - case STATE_INITIAL: + case ISystemEditPaneStates.STATE_INITIAL: break; - case STATE_APPLIED: + case ISystemEditPaneStates.STATE_APPLIED: applyPressed(); break; } diff --git a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java index 474e4c19c95..af371f588ae 100644 --- a/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java +++ b/rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/SubSystem.java @@ -17,6 +17,7 @@ * Martin Oberhuber (Wind River) - [175262] IHost.getSystemType() should return IRSESystemType * David Dykstal (IBM) - 142806: refactoring persistence framework * Martin Oberhuber (Wind River) - [168975] Move RSE Events API to Core + * Martin Oberhuber (Wind River) - [183165] Do not implement constant interfaces ********************************************************************************/ package org.eclipse.rse.core.subsystems; @@ -109,7 +110,9 @@ import org.eclipse.ui.progress.WorkbenchJob; * */ -public abstract class SubSystem extends RSEModelObject implements IAdaptable, ISystemFilterPoolReferenceManagerProvider, ISystemResourceChangeEvents, ISubSystem +public abstract class SubSystem extends RSEModelObject + implements IAdaptable, ISubSystem, + ISystemFilterPoolReferenceManagerProvider { @@ -1041,13 +1044,13 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS */ public void filterEventFilterPoolReferenceCreated(ISystemFilterPoolReference newPoolRef) { if (getSubSystemConfiguration().showFilterPools()) { - fireEvent(newPoolRef, EVENT_ADD, this); - fireEvent(newPoolRef, EVENT_REVEAL_AND_SELECT, this); + fireEvent(newPoolRef, ISystemResourceChangeEvents.EVENT_ADD, this); + fireEvent(newPoolRef, ISystemResourceChangeEvents.EVENT_REVEAL_AND_SELECT, this); } else { ISystemFilterPool pool = newPoolRef.getReferencedFilterPool(); if (pool != null && pool.getSystemFilterCount() > 0) { ISystemFilterReference[] filterRefs = newPoolRef.getSystemFilterReferences(this); - fireEvent(filterRefs, EVENT_ADD_MANY, this, -1); // -1 means append to end + fireEvent(filterRefs, ISystemResourceChangeEvents.EVENT_ADD_MANY, this, -1); // -1 means append to end } } try { @@ -1065,12 +1068,12 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS { if (getSubSystemConfiguration().showFilterPools()) { - fireEvent(filterPoolRef, EVENT_DELETE, this); + fireEvent(filterPoolRef, ISystemResourceChangeEvents.EVENT_DELETE, this); } else if (filterPoolRef.getReferencedFilterPool().getSystemFilterCount()>0) { ISystemFilterReference[] filterRefs = filterPoolRef.getSystemFilterReferences(this); - fireEvent(filterRefs, EVENT_DELETE_MANY, this); + fireEvent(filterRefs, ISystemResourceChangeEvents.EVENT_DELETE_MANY, this); } try { @@ -1088,7 +1091,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS */ public void filterEventFilterPoolReferenceReset(ISystemFilterPoolReference filterPoolRef) { - fireEvent(filterPoolRef, EVENT_PROPERTYSHEET_UPDATE, this); // we assume its a move operation so little impact + fireEvent(filterPoolRef, ISystemResourceChangeEvents.EVENT_PROPERTYSHEET_UPDATE, this); // we assume its a move operation so little impact try { getSubSystemConfiguration().saveSubSystem(this); // fire model change event in case any BP code is listening... @@ -1104,7 +1107,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS */ public void filterEventFilterPoolReferencesReset() { - fireEvent(this, EVENT_CHANGE_CHILDREN, this); + fireEvent(this, ISystemResourceChangeEvents.EVENT_CHANGE_CHILDREN, this); try { getSubSystemConfiguration().saveSubSystem(this); @@ -1124,7 +1127,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS { if (getSubSystemConfiguration().showFilterPools()) { - fireEvent(poolRef, EVENT_RENAME, this); + fireEvent(poolRef, ISystemResourceChangeEvents.EVENT_RENAME, this); } else { @@ -1143,7 +1146,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS */ public void filterEventFilterPoolReferencesRePositioned(ISystemFilterPoolReference[] poolRefs, int delta) { - fireEvent(poolRefs, EVENT_MOVE_MANY, this, delta); + fireEvent(poolRefs, ISystemResourceChangeEvents.EVENT_MOVE_MANY, this, delta); try { getSubSystemConfiguration().saveSubSystem(this); // fire model change event in case any BP code is listening... @@ -1168,7 +1171,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS */ public void filterEventFilterCreated(Object selectedObject, ISystemFilter newFilter) { - fireEvent(newFilter,EVENT_REVEAL_AND_SELECT,selectedObject); + fireEvent(newFilter, ISystemResourceChangeEvents.EVENT_REVEAL_AND_SELECT, selectedObject); } // --------------------------------- // FILTER STRING REFERENCE EVENTS... @@ -1183,7 +1186,7 @@ public abstract class SubSystem extends RSEModelObject implements IAdaptable, IS */ public void filterEventFilterStringCreated(Object selectedObject, ISystemFilterString newFilterString) { - fireEvent(newFilterString,EVENT_REVEAL_AND_SELECT,selectedObject); + fireEvent(newFilterString, ISystemResourceChangeEvents.EVENT_REVEAL_AND_SELECT, selectedObject); } /**