Menu
▾
▴
[pcgen-commit-svn] SF.net SVN: pcgen:[10305] sandbox/cdomui/code/src/java/pcgen/gui
|
From: <cpm...@us...> - 2009-08-26 08:30:01
|
Revision: 10305
http://pcgen.svn.sourceforge.net/pcgen/?rev=10305&view=rev
Author: cpmeister
Date: 2009-08-26 08:29:49 +0000 (Wed, 26 Aug 2009)
Log Message:
-----------
Added entrypoint to demo the SkillInfoTab. The entrypoint is named "GUI2" under the debug menuitem. Still trying to figure out the renderer exception so try the demo at your own risk.
Modified Paths:
--------------
sandbox/cdomui/code/src/java/pcgen/gui/PCGenMenuBar.java
sandbox/cdomui/code/src/java/pcgen/gui/PCGen_Frame1.java
sandbox/cdomui/code/src/java/pcgen/gui2/PCGenFrame.java
sandbox/cdomui/code/src/java/pcgen/gui2/PCGenUIManager.java
sandbox/cdomui/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java
sandbox/cdomui/code/src/java/pcgen/gui2/tools/ResourceManager.java
Modified: sandbox/cdomui/code/src/java/pcgen/gui/PCGenMenuBar.java
===================================================================
--- sandbox/cdomui/code/src/java/pcgen/gui/PCGenMenuBar.java 2009-08-26 05:33:49 UTC (rev 10304)
+++ sandbox/cdomui/code/src/java/pcgen/gui/PCGenMenuBar.java 2009-08-26 08:29:49 UTC (rev 10305)
@@ -42,6 +42,7 @@
import pcgen.gui.utils.BrowserLauncher;
import pcgen.gui.utils.JOpenRecentMenu;
import pcgen.gui.utils.Utility;
+import pcgen.gui2.PCGenUIManager;
import pcgen.util.FOPResourceChecker;
import pcgen.util.Logging;
import pcgen.util.PropertyFactory;
@@ -585,6 +586,17 @@
}
}, "debug.console", null, null, true);
debugMenu.add(consoleMenuItem);
+
+ JMenuItem gui2MenuItem = new JMenuItem("GUI2");
+ gui2MenuItem.addActionListener(new ActionListener(){
+
+ public void actionPerformed(ActionEvent e)
+ {
+ PCGenUIManager.startGUI();
+ }
+
+ });
+ debugMenu.add(gui2MenuItem);
return debugMenu;
}
Modified: sandbox/cdomui/code/src/java/pcgen/gui/PCGen_Frame1.java
===================================================================
--- sandbox/cdomui/code/src/java/pcgen/gui/PCGen_Frame1.java 2009-08-26 05:33:49 UTC (rev 10304)
+++ sandbox/cdomui/code/src/java/pcgen/gui/PCGen_Frame1.java 2009-08-26 08:29:49 UTC (rev 10305)
@@ -1764,7 +1764,7 @@
* What PC's tab is on top?
* @return PlayerCharacter
*/
- PlayerCharacter getCurrentPC()
+ public PlayerCharacter getCurrentPC()
{
final int currTab = baseTabbedPane.getSelectedIndex();
Modified: sandbox/cdomui/code/src/java/pcgen/gui2/PCGenFrame.java
===================================================================
--- sandbox/cdomui/code/src/java/pcgen/gui2/PCGenFrame.java 2009-08-26 05:33:49 UTC (rev 10304)
+++ sandbox/cdomui/code/src/java/pcgen/gui2/PCGenFrame.java 2009-08-26 08:29:49 UTC (rev 10305)
@@ -29,6 +29,8 @@
import javax.swing.JFrame;
import javax.swing.KeyStroke;
import pcgen.core.facade.SourceFacade;
+import pcgen.gui2.util.DefaultGenericComboBoxModel;
+import pcgen.gui2.util.DefaultGenericListModel;
import pcgen.gui2.util.GenericComboBoxModel;
import pcgen.gui2.util.GenericListModel;
@@ -80,22 +82,22 @@
public GenericListModel<File> getRecentCharacters()
{
- return null;
+ return new DefaultGenericListModel<File>();
}
public GenericListModel<File> getRecentParties()
{
- return null;
+ return new DefaultGenericListModel<File>();
}
public GenericListModel<SourceFacade> getQuickSources()
{
- return null;
+ return new DefaultGenericListModel<SourceFacade>();
}
public GenericComboBoxModel<File> getCharacterSheets()
{
- return null;
+ return new DefaultGenericComboBoxModel<File>();
}
}
Modified: sandbox/cdomui/code/src/java/pcgen/gui2/PCGenUIManager.java
===================================================================
--- sandbox/cdomui/code/src/java/pcgen/gui2/PCGenUIManager.java 2009-08-26 05:33:49 UTC (rev 10304)
+++ sandbox/cdomui/code/src/java/pcgen/gui2/PCGenUIManager.java 2009-08-26 08:29:49 UTC (rev 10305)
@@ -23,12 +23,17 @@
import java.io.File;
import java.util.Collection;
import java.util.EnumMap;
+import java.util.Hashtable;
import java.util.Map;
+import javax.swing.JFrame;
import pcgen.core.facade.CharacterFacade;
import pcgen.core.facade.ClassFacade;
import pcgen.core.facade.GameModeFacade;
import pcgen.core.facade.SourceFacade;
import pcgen.gui2.filter.DisplayableFilter;
+import pcgen.gui2.mock.CharacterMock;
+import pcgen.gui2.tabs.SkillInfoTab;
+import pcgen.gui2.util.DefaultGenericListModel;
import pcgen.gui2.util.GenericListModel;
/**
@@ -46,6 +51,24 @@
{
}
+ public static void startGUI()
+ {
+ PCGenFrame frame = new PCGenFrame();
+ frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+ SkillInfoTab tab = new SkillInfoTab();
+
+ CharacterMock mock = new CharacterMock();
+ mock.addCharacterLevels(new ClassFacade[]
+ {
+ mock.getDataSet().getClass("Fighter")
+ });
+ Hashtable<Object, Object> stateData = tab.createState(mock);
+ tab.restoreState(stateData);
+ frame.getContentPane().add(tab);
+ frame.pack();
+ frame.setVisible(true);
+ }
+
public static boolean isQualified(CharacterFacade character, ClassFacade c)
{
return false;
@@ -54,7 +77,7 @@
public static <T> GenericListModel<DisplayableFilter<? super T>> getDisplayedFilters(
Class<T> c)
{
- return null;
+ return new DefaultGenericListModel<DisplayableFilter<? super T>>();
}
public static Collection<File> getCharacterSheets()
@@ -67,10 +90,12 @@
return null;
}
- public static GenericListModel<SourceFacade> getSources(GameModeFacade gameMode)
+ public static GenericListModel<SourceFacade> getSources(
+ GameModeFacade gameMode)
{
return null;
}
+
public static boolean isHouseRuleSelected(HouseRule rule)
{
Boolean b = rulesMap.get(rule);
Modified: sandbox/cdomui/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java
===================================================================
--- sandbox/cdomui/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java 2009-08-26 05:33:49 UTC (rev 10304)
+++ sandbox/cdomui/code/src/java/pcgen/gui2/tabs/SkillInfoTab.java 2009-08-26 08:29:49 UTC (rev 10305)
@@ -132,7 +132,10 @@
private void setSelectedSkill(SkillFacade skill)
{
this.selectedSkill = skill;
- setInfoPaneText(skill.getInfo());
+ if (skill != null)
+ {
+ setInfoPaneText(skill.getInfo());
+ }
}
private void setSelectedLevel(CharacterLevelFacade selectedLevel)
@@ -175,10 +178,12 @@
skillcostTable.setModel(skillcostModel);
skillpointTable.setModel(skillpointModel);
+ setSelectedLevel((CharacterLevelFacade) state.get("SelectedCharacterLevel"));
+
skillPanel.restoreState(state);
- skillPanel.setDefaultEditor(Float.class,
- (SkillRankSpinnerEditor) state.get(SkillRankSpinnerEditor.class));
- setSelectedLevel((CharacterLevelFacade) state.get("SelectedCharacterLevel"));
+ skillPanel.setDefaultEditor(Float.class, (SkillRankSpinnerEditor) state.get(
+ SkillRankSpinnerEditor.class));
+
setSelectedSkill((SkillFacade) state.get("SelectedSkill"));
}
@@ -200,9 +205,9 @@
@Override
public Component getTableCellEditorComponent(JTable table, Object value,
- boolean isSelected,
- int row,
- int column)
+ boolean isSelected,
+ int row,
+ int column)
{
model.setSkill(selectedSkill);
model.setLevel(selectedLevel);
@@ -212,7 +217,7 @@
}
private static final class SkillTreeViewModel implements FilterableTreeViewModel<SkillFacade>,
- DataView<SkillFacade>
+ DataView<SkillFacade>
{
private enum SkillTreeView implements TreeView<SkillFacade>
@@ -275,7 +280,8 @@
public List<TreeViewPath<SkillFacade>> getPaths(SkillFacade pobj)
{
return Arrays.asList(new TreeViewPath<SkillFacade>(pobj,
- level.getSkillCost(pobj)));
+ level.getSkillCost(
+ pobj)));
}
};
@@ -290,9 +296,10 @@
@SuppressWarnings("unchecked")
public List<TreeViewPath<SkillFacade>> getPaths(SkillFacade pobj)
{
- return Arrays.asList(new TreeViewPath<SkillFacade>(pobj,
- level.getSkillCost(pobj),
- pobj.getType()));
+ return Arrays.asList(
+ new TreeViewPath<SkillFacade>(pobj,
+ level.getSkillCost(pobj),
+ pobj.getType()));
}
};
@@ -300,8 +307,7 @@
new DefaultDataViewColumn("Total", Integer.class, true),
new DefaultDataViewColumn("Modifier", Integer.class, true),
new DefaultDataViewColumn("Ranks", Float.class, true, true),
- new DefaultDataViewColumn("Skill Cost", SkillCost.class,
- true),
+ new DefaultDataViewColumn("Skill Cost", SkillCost.class, true),
new DefaultDataViewColumn("Source", String.class));
private CharacterFacade character;
private CharacterLevelFacade level;
@@ -441,10 +447,12 @@
implements ListDataListener
{
- private static final String[] columns = {"Level",
- "Class",
- "Spent",
- "Gained"
+ private static final String[] columns =
+ {
+ "Level",
+ "Class",
+ "Spent",
+ "Gained"
};
private final GenericListModel<CharacterLevelFacade> model;
Modified: sandbox/cdomui/code/src/java/pcgen/gui2/tools/ResourceManager.java
===================================================================
--- sandbox/cdomui/code/src/java/pcgen/gui2/tools/ResourceManager.java 2009-08-26 05:33:49 UTC (rev 10304)
+++ sandbox/cdomui/code/src/java/pcgen/gui2/tools/ResourceManager.java 2009-08-26 08:29:49 UTC (rev 10305)
@@ -42,7 +42,7 @@
{
}
- public static final String LANGUATE_BUNDLE = "pcgen/gui/prop/LanguageBundle";
+ public static final String LANGUATE_BUNDLE = "pcgen/gui2/prop/LanguageBundle";
public static final String LANGUATE_BUNDLE2 = "pcgen/gui2/prop/LanguageBundle2";
/** Undefined Property */
public static final String UNDEFINED = " not defined."; //$NON-NLS-1$
@@ -68,7 +68,7 @@
// b) English (if selected) isn't overriden by the system default
Locale.setDefault(locale);
}
- ensureLoaded(LANGUATE_BUNDLE2);
+ ensureLoaded(LANGUATE_BUNDLE);
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|