Comparer le texte

Trouver la différence entre deux fichiers texte

Éditeur live

Cacher identiques

Sans retour à la ligne

Vue

Niveau de précision

Coloration syntaxique

Diffchecker Desktop La façon la plus sécurisée d'utiliser Diffchecker. Obtenez l'application Diffchecker Desktop : vos diffs ne quittent jamais votre ordinateur !Obtenir Desktop

AbstractAction.java

Créé il y a 7 ansLe diff n'expire jamais

41 suppressions

Lignes
Total
Supprimé

Caractères
Total
Supprimé

Pour continuer à utiliser cette fonctionnalité, passez à Diffchecker Pro Voir les prix

253 lignes

76 ajouts

Lignes
Total
Ajouté

Caractères
Total
Ajouté

Pour continuer à utiliser cette fonctionnalité, passez à Diffchecker Pro Voir les prix

295 lignes

* Licensed 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 com.haulmont.cuba.gui.components;

import com.google.common.collect.Collections2;

import com.google.common.collect.ImmutableList;

import com.haulmont.bali.events.EventHub;

import com.haulmont.cuba.core.global.AppBeans;

import com.haulmont.cuba.core.global.Messages;

import com.haulmont.cuba.core.global.UserSessionSource;

import com.haulmont.cuba.gui.icons.Icons;

import com.haulmont.cuba.security.global.UserSession;

import javax.annotation.Nullable;

import java.beans.PropertyChangeListener;

import java.beans.PropertyChangeEvent;

import java.beans.PropertyChangeSupport;

import java.util.Collection;

import java.util.*;

import java.util.List;

import java.util.Objects;

import java.util.function.Consumer;

/**

* Abstract class for GUI actions.

public abstract class AbstractAction implements Action {

protected String id;

protected String caption;

protected String description;

protected String icon;

protected boolean enabled = true;

protected boolean visible = true;

protected List<Component.ActionOwner> owners = new ArrayList<>();

protected List<ActionOwner> owners = ImmutableList.of();

protected PropertyChangeSupport changeSupport;

protected Messages messages = AppBeans.get(Messages.NAME);

protected UserSession userSession;

protected KeyCombination shortcut;

protected boolean primary = false;

protected EventHub eventHub;

// legacy field

@Deprecated

private Messages messages;

protected AbstractAction() {

// do not init messages here

}

protected AbstractAction(String id) {

UserSessionSource sessionSource = AppBeans.get(UserSessionSource.NAME);

userSession = sessionSource.getUserSession();

this.id = id;

this.messages = AppBeans.get(Messages.NAME); // legacy behaviour

}

protected AbstractAction(String id, @Nullable String shortcut) {

this(id);

if (shortcut != null) {

this.shortcut = KeyCombination.create(shortcut);

}

protected AbstractAction(String id, Status status) {

this(id);

this.primary = status == Status.PRIMARY;

}

// lazy initializer

protected EventHub getEventHub() {

if (eventHub == null) {

eventHub = new EventHub();

}

return eventHub;

}

protected boolean hasSubscriptions(Class<?> eventClass) {

return eventHub != null && eventHub.hasSubscriptions(eventClass);

}

@Override

public String getId() {

return id;

}

@Override

public String getCaption() {

return caption == null ? getDefaultCaption() : caption;

}

protected String getDefaultCaption() {

return messages.getMessage(getClass(), id);

if (messages != null) {

// legacy behaviour

return messages.getMessage(getClass(), id);

} else {

return null;

}

@Override

public void setCaption(String caption) {

String oldValue = this.caption;

if (!Objects.equals(oldValue, caption)) {

this.caption = caption;

firePropertyChange(PROP_CAPTION, oldValue, caption);

}

@Override

public String getDescription() {

return description;

}

@Override

public void setDescription(String description) {

String oldValue = this.description;

if (!Objects.equals(oldValue, description)) {

this.description = description;

firePropertyChange(PROP_DESCRIPTION, oldValue, description);

}

@Override

public KeyCombination getShortcutCombination() {

return shortcut;

}

@Override

public void setShortcutCombination(KeyCombination shortcut) {

KeyCombination oldValue = this.shortcut;

if (!Objects.equals(oldValue, shortcut)) {

this.shortcut = shortcut;

firePropertyChange(PROP_SHORTCUT, oldValue, shortcut);

}

@Override

public void setShortcut(String shortcut) {

if (shortcut != null) {

setShortcutCombination(KeyCombination.create(shortcut));

} else {

setShortcutCombination(null);

}

@Override

public String getIcon() {

return icon;

}

@Override

public void setIcon(String icon) {

String oldValue = this.icon;

if (!Objects.equals(oldValue, icon)) {

this.icon = icon;

firePropertyChange(PROP_ICON, oldValue, icon);

}

@Override

public void setIconFromSet(Icons.Icon icon) {

String iconName = AppBeans.get(Icons.class)

.get(icon);

setIcon(iconName);

}

@Override

public boolean isEnabled() {

return enabled;

}

@Override

public void setEnabled(boolean enabled) {

boolean oldValue = this.enabled;

if (oldValue != enabled) {

this.enabled = enabled;

for (Component.ActionOwner owner : owners) {

for (ActionOwner owner : owners) {

if (owner != null && owner instanceof Component) {

if (owner instanceof Component) {

((Component) owner).setEnabled(enabled);

}

firePropertyChange(PROP_ENABLED, oldValue, enabled);

}

@Override

public boolean isVisible() {

return visible;

}

@Override

public void setVisible(boolean visible) {

boolean oldValue = this.visible;

if (oldValue != visible) {

this.visible = visible;

for (Component.ActionOwner owner : owners) {

for (ActionOwner owner : owners) {

if (owner != null && owner instanceof Component) {

if (owner instanceof Component) {

((Component) owner).setVisible(visible);

}

firePropertyChange(PROP_VISIBLE, oldValue, visible);

}

@Override

public Collection<Component.ActionOwner> getOwners() {

public Collection<ActionOwner> getOwners() {

return Collections.unmodifiableCollection(owners);

return owners;

}

@Override

public Component.ActionOwner getOwner() {

public ActionOwner getOwner() {

return owners.isEmpty() ? null : owners.get(0);

}

@Override

public void addOwner(Component.ActionOwner actionOwner) {

public void addOwner(ActionOwner actionOwner) {

if (!owners.contains(actionOwner)) {

owners.add(actionOwner);

if (owners.isEmpty()) {

owners = ImmutableList.of(actionOwner);

} else {

owners = ImmutableList.<ActionOwner>builder()

.addAll(owners)

.add(actionOwner)

.build();

}

@Override

public void removeOwner(Component.ActionOwner actionOwner) {

public void removeOwner(ActionOwner actionOwner) {

owners.remove(actionOwner);

if (!owners.isEmpty()) {

if (owners.size() == 1 && owners.get(0) == actionOwner) {

owners = ImmutableList.of();

} else {

owners = ImmutableList.<ActionOwner>builder()

.addAll(Collections2.filter(owners, o -> o != actionOwner))

.build();

}

@Override

public void addPropertyChangeListener(PropertyChangeListener listener) {

public void addPropertyChangeListener(Consumer<PropertyChangeEvent> listener) {

if (changeSupport == null) {

getEventHub().subscribe(PropertyChangeEvent.class, listener);

changeSupport = new PropertyChangeSupport(this);

}

changeSupport.addPropertyChangeListener(listener);

}

@Override

public void removePropertyChangeListener(PropertyChangeListener listener) {

public void removePropertyChangeListener(Consumer<PropertyChangeEvent> listener) {

if (changeSupport == null) {

if (eventHub != null) {

return;

eventHub.unsubscribe(PropertyChangeEvent.class, listener);

}

changeSupport.removePropertyChangeListener(listener);

}

protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) {

if (changeSupport == null || Objects.equals(oldValue, newValue)) {

if (Objects.equals(oldValue, newValue)) {

return;

}

changeSupport.firePropertyChange(propertyName, oldValue, newValue);

if (eventHub != null && eventHub.hasSubscriptions(PropertyChangeEvent.class)) {

PropertyChangeEvent event = new PropertyChangeEvent(this, propertyName, oldValue, newValue);

eventHub.publish(PropertyChangeEvent.class, event);

}

@Override

public void refreshState() {

}

/**

* @return true if action is primary or false otherwise

public boolean isPrimary() {

return primary;

}

/**

* Sets whether action is primary or not.

* @param primary primary

public void setPrimary(boolean primary) {

this.primary = primary;

}

Différences enregistrées

Texte d'origine

Ouvrir un fichier

/*
 * Copyright (c) 2008-2016 Haulmont.
 *
 * Licensed 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 com.haulmont.cuba.gui.components;

import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.core.global.Messages;
import com.haulmont.cuba.core.global.UserSessionSource;
import com.haulmont.cuba.gui.icons.Icons;
import com.haulmont.cuba.security.global.UserSession;

import javax.annotation.Nullable;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.util.*;

/**
 * Abstract class for GUI actions.
 */
public abstract class AbstractAction implements Action {

protected String id;

protected String caption;

protected String description;

protected String icon;

protected boolean enabled = true;

protected boolean visible = true;

protected List<Component.ActionOwner> owners = new ArrayList<>();

protected PropertyChangeSupport changeSupport;

protected Messages messages = AppBeans.get(Messages.NAME);

protected UserSession userSession;

protected KeyCombination shortcut;

protected boolean primary = false;

protected AbstractAction(String id) {
        UserSessionSource sessionSource = AppBeans.get(UserSessionSource.NAME);
        userSession = sessionSource.getUserSession();
        this.id = id;
    }

protected AbstractAction(String id, @Nullable String shortcut) {
        this(id);
        if (shortcut != null) {
            this.shortcut = KeyCombination.create(shortcut);
        }
    }

protected AbstractAction(String id, Status status) {
        this(id);

this.primary = status == Status.PRIMARY;
    }

@Override
    public String getId() {
        return id;
    }

@Override
    public String getCaption() {
        return caption == null ? getDefaultCaption() : caption;
    }

protected String getDefaultCaption() {
        return messages.getMessage(getClass(), id);
    }

@Override
    public void setCaption(String caption) {
        String oldValue = this.caption;
        if (!Objects.equals(oldValue, caption)) {
            this.caption = caption;
            firePropertyChange(PROP_CAPTION, oldValue, caption);
        }
    }

@Override
    public String getDescription() {
        return description;
    }

@Override
    public void setDescription(String description) {
        String oldValue = this.description;
        if (!Objects.equals(oldValue, description)) {
            this.description = description;
            firePropertyChange(PROP_DESCRIPTION, oldValue, description);
        }
    }

@Override
    public KeyCombination getShortcutCombination() {
        return shortcut;
    }

@Override
    public void setShortcutCombination(KeyCombination shortcut) {
        KeyCombination oldValue = this.shortcut;
        if (!Objects.equals(oldValue, shortcut)) {
            this.shortcut = shortcut;
            firePropertyChange(PROP_SHORTCUT, oldValue, shortcut);
        }
    }

@Override
    public void setShortcut(String shortcut) {
        if (shortcut != null) {
            setShortcutCombination(KeyCombination.create(shortcut));
        } else {
            setShortcutCombination(null);
        }
    }

@Override
    public String getIcon() {
        return icon;
    }

@Override
    public void setIcon(String icon) {
        String oldValue = this.icon;
        if (!Objects.equals(oldValue, icon)) {
            this.icon = icon;
            firePropertyChange(PROP_ICON, oldValue, icon);
        }
    }

@Override
    public void setIconFromSet(Icons.Icon icon) {
        String iconName = AppBeans.get(Icons.class)
                .get(icon);
        setIcon(iconName);
    }

@Override
    public boolean isEnabled() {
        return enabled;
    }

@Override
    public void setEnabled(boolean enabled) {
        boolean oldValue = this.enabled;
        if (oldValue != enabled) {
            this.enabled = enabled;
            for (Component.ActionOwner owner : owners) {
                if (owner != null && owner instanceof Component) {
                    ((Component) owner).setEnabled(enabled);
                }
            }
            firePropertyChange(PROP_ENABLED, oldValue, enabled);
        }
    }

@Override
    public boolean isVisible() {
        return visible;
    }

@Override
    public void setVisible(boolean visible) {
        boolean oldValue = this.visible;
        if (oldValue != visible) {
            this.visible = visible;
            for (Component.ActionOwner owner : owners) {
                if (owner != null && owner instanceof Component) {
                    ((Component) owner).setVisible(visible);
                }
            }
            firePropertyChange(PROP_VISIBLE, oldValue, visible);
        }
    }

@Override
    public Collection<Component.ActionOwner> getOwners() {
        return Collections.unmodifiableCollection(owners);
    }

@Override
    public Component.ActionOwner getOwner() {
        return owners.isEmpty() ? null : owners.get(0);
    }

@Override
    public void addOwner(Component.ActionOwner actionOwner) {
        if (!owners.contains(actionOwner)) {
            owners.add(actionOwner);
        }
    }

@Override
    public void removeOwner(Component.ActionOwner actionOwner) {
        owners.remove(actionOwner);
    }

@Override
    public void addPropertyChangeListener(PropertyChangeListener listener) {
        if (changeSupport == null) {
            changeSupport = new PropertyChangeSupport(this);
        }
        changeSupport.addPropertyChangeListener(listener);
    }

@Override
    public void removePropertyChangeListener(PropertyChangeListener listener) {
        if (changeSupport == null) {
            return;
        }
        changeSupport.removePropertyChangeListener(listener);
    }

protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
        if (changeSupport == null || Objects.equals(oldValue, newValue)) {
            return;
        }
        changeSupport.firePropertyChange(propertyName, oldValue, newValue);
    }

@Override
    public void refreshState() {
    }

public boolean isPrimary() {
        return primary;
    }

public void setPrimary(boolean primary) {
        this.primary = primary;
    }
}

Texte modifié

Ouvrir un fichier

import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableList;
import com.haulmont.bali.events.EventHub;
import com.haulmont.cuba.core.global.AppBeans;
import com.haulmont.cuba.core.global.Messages;
import com.haulmont.cuba.gui.icons.Icons;

import javax.annotation.Nullable;
import java.beans.PropertyChangeEvent;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.function.Consumer;

/**
 * Abstract class for GUI actions.
 */
public abstract class AbstractAction implements Action {

protected String id;

protected String caption;
    protected String description;
    protected String icon;

protected boolean enabled = true;
    protected boolean visible = true;

protected List<ActionOwner> owners = ImmutableList.of();

protected KeyCombination shortcut;

protected boolean primary = false;

protected EventHub eventHub;

// legacy field
    @Deprecated
    private Messages messages;

protected AbstractAction() {
        // do not init messages here
    }

protected AbstractAction(String id) {
        this.id = id;
        this.messages = AppBeans.get(Messages.NAME); // legacy behaviour
    }

protected AbstractAction(String id, @Nullable String shortcut) {
        this(id);
        if (shortcut != null) {
            this.shortcut = KeyCombination.create(shortcut);
        }
    }

protected AbstractAction(String id, Status status) {
        this(id);

this.primary = status == Status.PRIMARY;
    }

// lazy initializer
    protected EventHub getEventHub() {
        if (eventHub == null) {
            eventHub = new EventHub();
        }
        return eventHub;
    }

protected boolean hasSubscriptions(Class<?> eventClass) {
        return eventHub != null && eventHub.hasSubscriptions(eventClass);
    }

@Override
    public String getId() {
        return id;
    }

@Override
    public String getCaption() {
        return caption == null ? getDefaultCaption() : caption;
    }

protected String getDefaultCaption() {
        if (messages != null) {
            // legacy behaviour
            return messages.getMessage(getClass(), id);
        } else {
            return null;
        }
    }

@Override
    public String getDescription() {
        return description;
    }

@Override
    public KeyCombination getShortcutCombination() {
        return shortcut;
    }

@Override
    public String getIcon() {
        return icon;
    }

@Override
    public void setIconFromSet(Icons.Icon icon) {
        String iconName = AppBeans.get(Icons.class)
                .get(icon);
        setIcon(iconName);
    }

@Override
    public boolean isEnabled() {
        return enabled;
    }

@Override
    public void setEnabled(boolean enabled) {
        boolean oldValue = this.enabled;
        if (oldValue != enabled) {
            this.enabled = enabled;
            for (ActionOwner owner : owners) {
                if (owner instanceof Component) {
                    ((Component) owner).setEnabled(enabled);
                }
            }
            firePropertyChange(PROP_ENABLED, oldValue, enabled);
        }
    }

@Override
    public boolean isVisible() {
        return visible;
    }

@Override
    public void setVisible(boolean visible) {
        boolean oldValue = this.visible;
        if (oldValue != visible) {
            this.visible = visible;
            for (ActionOwner owner : owners) {
                if (owner instanceof Component) {
                    ((Component) owner).setVisible(visible);
                }
            }
            firePropertyChange(PROP_VISIBLE, oldValue, visible);
        }
    }

@Override
    public Collection<ActionOwner> getOwners() {
        return owners;
    }

@Override
    public ActionOwner getOwner() {
        return owners.isEmpty() ? null : owners.get(0);
    }

@Override
    public void addOwner(ActionOwner actionOwner) {
        if (!owners.contains(actionOwner)) {
            if (owners.isEmpty()) {
                owners = ImmutableList.of(actionOwner);
            } else {
                owners = ImmutableList.<ActionOwner>builder()
                        .addAll(owners)
                        .add(actionOwner)
                        .build();
            }
        }
    }

@Override
    public void removeOwner(ActionOwner actionOwner) {
        if (!owners.isEmpty()) {
            if (owners.size() == 1 && owners.get(0) == actionOwner) {
                owners = ImmutableList.of();
            } else {
                owners = ImmutableList.<ActionOwner>builder()
                            .addAll(Collections2.filter(owners, o -> o != actionOwner))
                            .build();
            }
        }
    }

@Override
    public void addPropertyChangeListener(Consumer<PropertyChangeEvent> listener) {
        getEventHub().subscribe(PropertyChangeEvent.class, listener);
    }

@Override
    public void removePropertyChangeListener(Consumer<PropertyChangeEvent> listener) {
        if (eventHub != null) {
            eventHub.unsubscribe(PropertyChangeEvent.class, listener);
        }
    }

protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) {
        if (Objects.equals(oldValue, newValue)) {
            return;
        }
        if (eventHub != null && eventHub.hasSubscriptions(PropertyChangeEvent.class)) {
            PropertyChangeEvent event = new PropertyChangeEvent(this, propertyName, oldValue, newValue);
            eventHub.publish(PropertyChangeEvent.class, event);
        }
    }

@Override
    public void refreshState() {
    }

/**
     * @return true if action is primary or false otherwise
     */
    public boolean isPrimary() {
        return primary;
    }

/**
     * Sets whether action is primary or not.
     *
     * @param primary primary
     */
    public void setPrimary(boolean primary) {
        this.primary = primary;
    }
}