UI Improvements, prep work for adding in Errata Items to repository #164
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| { | ||
| "statsByRuleSet": { | ||
| "SecondEdition": [ | ||
| { | ||
| "accuracy": 1, | ||
| "damage": 4, | ||
| "damageTypeString": "Lethal", | ||
| "defence": -1, | ||
| "rate": 2, | ||
| "speed": 1, | ||
| "inflictsNoDamage": false, | ||
| "tags": [], | ||
| "minimumDamage": 1, | ||
| "name": "Close", | ||
| "type": "Melee Weapon" | ||
| } | ||
| ] | ||
| }, | ||
| "description": "2E Core p366, 2.5 Errata p15", | ||
| "name": "Chopping Sword", | ||
| "collectionFactory": {}, | ||
| "composition": "None", | ||
| "cost": { | ||
| "costType": "Resources", | ||
| "costValue": 2 | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. A single sample JSON item. I have the rest of the Errata items done, I just need to alter the build system to take them into account, then I'll add them into git. There was a problem hiding this comment. This and your (now removed) comment in the changelog, made me think: There was a problem hiding this comment. That would be one way to handle distribution. I was envisioning just rolling them into the deployment process, so they'd just naturally appear in the I'm open to adding in the items if and only if the user has no existing database, but the only problem I see is that we still don't have an ordering system in place for bootjobs. So we can't rely on the |
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package net.sf.anathema.character.equipment.item; | ||
|
|
||
| import java.awt.Component; | ||
|
|
||
| import net.disy.commons.swing.action.SmartAction; | ||
| import net.sf.anathema.character.equipment.item.model.IEquipmentDatabaseManagement; | ||
| import net.sf.anathema.character.equipment.item.view.IEquipmentDatabaseView; | ||
| import net.sf.anathema.lib.control.objectvalue.IObjectValueChangedListener; | ||
| import net.sf.anathema.framework.presenter.resources.PlatformUI; | ||
| import net.sf.anathema.lib.gui.wizard.workflow.ICondition; | ||
| import net.sf.anathema.lib.resources.IResources; | ||
|
|
||
| public final class CopyEquipmentTemplateAction extends SmartAction { | ||
| private static final long serialVersionUID = -2131791434827503585L; | ||
| private final IEquipmentDatabaseManagement model; | ||
| private final IResources resources; | ||
|
|
||
| public CopyEquipmentTemplateAction(IResources resources, IEquipmentDatabaseManagement model) { | ||
| super(new PlatformUI(resources).getCopyIcon()); | ||
| this.resources = resources; | ||
| this.model = model; | ||
| model.getTemplateEditModel().getDescription().getName().addTextChangedListener(new IObjectValueChangedListener<String>() { | ||
| public void valueChanged(String newValue) { | ||
| setEnabled(true); | ||
| } | ||
| }); | ||
| setEnabled(true); | ||
| setToolTipText(resources.getString("Equipment.Creation.Item.CopyActionTooltip")); //$NON-NLS-1$ | ||
| } | ||
|
|
||
| @Override | ||
| protected void execute(Component parentComponent) { | ||
| DiscardChangesVetor vetor = new DiscardChangesVetor(resources, new ICondition() { | ||
| public boolean isFulfilled() { | ||
| return model.getTemplateEditModel().isDirty(); | ||
| } | ||
| }, parentComponent); | ||
| if (vetor.vetos()) { | ||
| return; | ||
| } | ||
| model.getTemplateEditModel().copyNewTemplate(); | ||
| setEnabled(false); | ||
| } | ||
|
|
||
| } | ||
|
There was a problem hiding this comment. New button to allow copying of an item in the equipment database. |
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| package net.sf.anathema.character.equipment.impl.module; | ||
|
|
||
| import net.sf.anathema.framework.IAnathemaModel; | ||
| import net.sf.anathema.framework.presenter.toolbar.IAnathemaTool; | ||
| import net.sf.anathema.framework.view.toolbar.IAnathemaToolbar; | ||
| import net.sf.anathema.initialization.Tool; | ||
| import net.sf.anathema.lib.resources.IResources; | ||
| import net.sf.anathema.platform.database.StartDatabaseAction; | ||
|
|
||
| @Tool | ||
| public class StartEquipmentDatabaseTool implements IAnathemaTool { | ||
|
|
||
| public void add(IResources resources, IAnathemaModel model, IAnathemaToolbar toolbar) { | ||
| toolbar.addSeparator(); | ||
| EquipmentDatabaseActionProperties properties = new EquipmentDatabaseActionProperties(resources, model); | ||
| toolbar.addTools(StartDatabaseAction.createToolAction(resources, model, properties)); | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. I'm honestly not sure why nobody ever wrote this class. The backend work was mostly good to go, it just needed a tool action to add the Equipment Database to the toolbar. There was a problem hiding this comment. I had tried to do so once before, but was thrown off when the resulting button appeared to the left of new/load/save functions, which looks a bit unnatural. We'd briefly discussed adding some means of determining sorting or priority, which I'd planned to look at eventually. I suppose it doesn't really hurt to do now, though. :) |
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Keep in mind that .gitignore just keeps stuff from getting picked up by
git statusor your gui tool. You can still explicitly add anything ignored here into git by usinggit add.