Skip to content

WICKET-6774: rework of component state #424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
papegaaij wants to merge 10 commits into
base: master
Choose a base branch
from
Open

WICKET-6774: rework of component state #424

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bdf4706
WICKET-6774: rework of component state
papegaaij Apr 30, 2020
d091fe0
WICKET-6774: do not recreate state when not needed
papegaaij Apr 30, 2020
a354416
WICKET-6774: inline state unpacking to improve performance
papegaaij Apr 30, 2020
091d0e0
WICKET-6774: minor performance improvements, fixed header
papegaaij May 1, 2020
8ba675c
WICKET-6774: mutable state
papegaaij May 6, 2020
2628cb6
WICKET-6774: add documentation
papegaaij May 6, 2020
343b0d2
WICKET-6774: keep behavior ids stable during request
papegaaij May 6, 2020
e27b56e
Merge branch 'master' into wicket-6774
papegaaij May 15, 2020
6174a1e
WICKET-6774: Use flag to fixate behavior ids
papegaaij May 25, 2020
5f67689
Merge remote-tracking branch 'origin/master' into wicket-6774
papegaaij May 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 127 additions & 25 deletions wicket-core/src/main/java/org/apache/wicket/ComponentState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
Copy link
Copy Markdown
Contributor

@solomax solomax May 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i would restore formatting here :)

Copy link
Copy Markdown
Contributor Author

@papegaaij papegaaij May 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've found the setting in Eclipse to prevent it from reformatting these headers, hope that helps :)

* agreements. See the NOTICE file distributed with this work for additional information regarding
* copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the License. You may obtain a
* copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable
* law or agreed to in writing, software distributed under the License is distributed on an "AS IS"
* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License
* for the specific language governing permissions and limitations under the License.
*/
package org.apache.wicket;

Expand Down Expand Up @@ -206,30 +200,137 @@ static Object getMetaData(Object state, boolean modelSet)

static Object setModel(IModel< ? > model, Object state, boolean modelSet)
{
return createState(state, model, getBehaviors(state, modelSet),
getMetaData(state, modelSet));
Object stateBehavior;
Object stateMetaData;
if (state instanceof ComponentState)
{
ComponentState compState = (ComponentState) state;
stateBehavior = compState.getBehaviors();
stateMetaData = compState.getMetaData();
}
else if (modelSet)
{
stateBehavior = null;
stateMetaData = null;
}
else if (state instanceof MetaDataEntry || state instanceof MetaDataEntry[])
{
stateBehavior = null;
stateMetaData = state;
}
else
{
stateBehavior = state;
stateMetaData = null;
}

return createState(state, model, stateBehavior, stateMetaData);
}

static Object addBehaviors(Component component, Object state, boolean modelSet,
Behavior... behaviorsToAdd)
{
return createState(state, getModel(state, modelSet),
addBehaviors(component, getBehaviors(state, modelSet), behaviorsToAdd),
getMetaData(state, modelSet));
IModel< ? > stateModel;
Object stateBehavior;
Object stateMetaData;
if (state instanceof ComponentState)
{
ComponentState compState = (ComponentState) state;
stateModel = compState.getModel();
stateBehavior = compState.getBehaviors();
stateMetaData = compState.getMetaData();
}
else if (modelSet)
{
stateModel = (IModel< ? >) state;
stateBehavior = null;
stateMetaData = null;
}
else if (state instanceof MetaDataEntry || state instanceof MetaDataEntry[])
{
stateModel = null;
stateBehavior = null;
stateMetaData = state;
}
else
{
stateModel = null;
stateBehavior = state;
stateMetaData = null;
}

return createState(state, stateModel,
addBehaviors(component, stateBehavior, behaviorsToAdd), stateMetaData);
}

static Object removeBehaviors(Component component, Object state, boolean modelSet,
Behavior... behaviorsToRemove)
{
return createState(state, getModel(state, modelSet),
removeBehaviors(component, getBehaviors(state, modelSet), behaviorsToRemove),
getMetaData(state, modelSet));
IModel< ? > stateModel;
Object stateBehavior;
Object stateMetaData;
if (state instanceof ComponentState)
{
ComponentState compState = (ComponentState) state;
stateModel = compState.getModel();
stateBehavior = compState.getBehaviors();
stateMetaData = compState.getMetaData();
}
else if (modelSet)
{
stateModel = (IModel< ? >) state;
stateBehavior = null;
stateMetaData = null;
}
else if (state instanceof MetaDataEntry || state instanceof MetaDataEntry[])
{
stateModel = null;
stateBehavior = null;
stateMetaData = state;
}
else
{
stateModel = null;
stateBehavior = state;
stateMetaData = null;
}

return createState(state, stateModel,
removeBehaviors(component, stateBehavior, behaviorsToRemove), stateMetaData);
}

static <T> Object setMetaData(Object state, boolean modelSet, MetaDataKey<T> key, T data)
{
return createState(state, getModel(state, modelSet), getBehaviors(state, modelSet),
setMetaData(getMetaData(state, modelSet), key, data));
IModel< ? > stateModel;
Object stateBehavior;
Object stateMetaData;
if (state instanceof ComponentState)
{
ComponentState compState = (ComponentState) state;
stateModel = compState.getModel();
stateBehavior = compState.getBehaviors();
stateMetaData = compState.getMetaData();
}
else if (modelSet)
{
stateModel = (IModel< ? >) state;
stateBehavior = null;
stateMetaData = null;
}
else if (state instanceof MetaDataEntry || state instanceof MetaDataEntry[])
{
stateModel = null;
stateBehavior = null;
stateMetaData = state;
}
else
{
stateModel = null;
stateBehavior = state;
stateMetaData = null;
}

return createState(state, stateModel, stateBehavior, setMetaData(stateMetaData, key, data));
}

private static Object createState(Object oldState, IModel< ? > model, Object behaviors,
Expand Down Expand Up @@ -715,7 +816,8 @@ static Object detachBehaviors(Component component, Object state, boolean modelSe
if (behavior.isTemporary(component))
{
behavior.unbind(component);
return createState(state, getModel(state, modelSet), null, getMetaData(state, modelSet));
return createState(state, getModel(state, modelSet), null,
getMetaData(state, modelSet));
}
}
else if (behaviors instanceof Behavior[])
Expand Down