Author: tchemit Date: 2010-06-23 11:52:32 +0200 (Wed, 23 Jun 2010) New Revision: 1990 Url: http://nuiton.org/repositories/revision/jaxx/1990 Log: - remove deprecated api - set model busy when changing step Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/DataContext.java trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/DataContext.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/DataContext.java 2010-06-23 09:51:19 UTC (rev 1989) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/context/DataContext.java 2010-06-23 09:52:32 UTC (rev 1990) @@ -175,22 +175,6 @@ /** * * @param entry - * @param value - * @param key - * @deprecated since 2.0.1, use instead {@link #removeContextValue(DataContextEntry, String)} - */ - public void removeContextValue(DataContextEntry<?> entry, - Object value, - String key) { - removeContextValue(entry,key); -// String contextKey = getKey(entry, key); -// delegate.removeContextValue(entry.getKlass(), contextKey); -// delegate.removeContextValue(value.getClass(), contextKey); - } - - /** - * - * @param entry * @param klass * @param key */ @@ -199,9 +183,6 @@ String key) { String contextKey = getKey(entry, key); delegate.removeContextValue(klass,key); -// String contextKey = getKey(entry, key); -// delegate.removeContextValue(entry.getKlass(), contextKey); -// delegate.removeContextValue(value.getClass(), contextKey); } public void removeContextValue(DataContextEntry<?> entry, Modified: trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java =================================================================== --- trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java 2010-06-23 09:51:19 UTC (rev 1989) +++ trunk/jaxx-runtime/src/main/java/jaxx/runtime/swing/wizard/WizardModel.java 2010-06-23 09:52:32 UTC (rev 1990) @@ -138,7 +138,12 @@ throw new IllegalStateException("step " + e.toString() + " is not in universe of steps (" + steps + ')'); } - setStep(e); + setBusy(true); + try { + setStep(e); + } finally { + setBusy(false); + } } public E getStep() {