Menu
▾
▴
[Gridarta-commit] SF.net SVN: gridarta: [235] trunk/daimonin/src/daieditor
|
From: <aki...@us...> - 2006-07-07 08:29:48
|
Revision: 235 Author: akirschbaum Date: 2006-07-07 01:29:34 -0700 (Fri, 07 Jul 2006) ViewCVS: http://svn.sourceforge.net/gridarta/?rev=235&view=rev Log Message: ----------- Fix spelling errors (comments and identifiers). Modified Paths: -------------- trunk/crossfire/src/cfeditor/CArchPanelPan.java trunk/crossfire/src/cfeditor/arch/ArchObjectParser.java trunk/crossfire/src/cfeditor/arch/ArchObjectStack.java trunk/daimonin/src/daieditor/CArchPanelPan.java trunk/daimonin/src/daieditor/arch/ArchObjectStack.java Modified: trunk/crossfire/src/cfeditor/CArchPanelPan.java =================================================================== --- trunk/crossfire/src/cfeditor/CArchPanelPan.java 2006-07-05 22:05:43 UTC (rev 234) +++ trunk/crossfire/src/cfeditor/CArchPanelPan.java 2006-07-07 08:29:34 UTC (rev 235) @@ -191,7 +191,7 @@ /** * this is only needed when arche collection is run, so we want - * to know to which cathegorys the arches belong to: + * to know to which categories the arches belong to: * @return an array of nodenumbers from all arches in this panel */ public int[] getListNodeNrArray() { @@ -207,23 +207,23 @@ /** * this is only needed when arche collection is run, so we want - * to know to which cathegorys the arches belong to: - * @return an array of the cathegorys of all arches in this panel<br> + * to know to which categories the arches belong to: + * @return an array of the categories of all arches in this panel<br> * note that the same indices are used for same arches in 'getListNodeNrArray()' */ - public String[] getListCathegoryArray() { - final String[] cathList = new String[(int) (list.length() / 10.0)]; + public String[] getListCategoryArray() { + final String[] catList = new String[(int) (list.length() / 10.0)]; for (int i = 0; i < (int) (list.length() / 10.0); i++) { try { final int index = Integer.parseInt(list.substring(5 + 10 * i, 10 + 10 * i)); - cathList[i] = jbox.getItemAt(index).toString().trim(); + catList[i] = jbox.getItemAt(index).toString().trim(); } catch (final NullPointerException e) { - LOG.warn("Nullpointer in getListCathegoryArray()!", e); + LOG.warn("Nullpointer in getListCategoryArray()!", e); } } - return cathList; + return catList; } void refresh() { Modified: trunk/crossfire/src/cfeditor/arch/ArchObjectParser.java =================================================================== --- trunk/crossfire/src/cfeditor/arch/ArchObjectParser.java 2006-07-05 22:05:43 UTC (rev 234) +++ trunk/crossfire/src/cfeditor/arch/ArchObjectParser.java 2006-07-07 08:29:34 UTC (rev 235) @@ -216,10 +216,10 @@ boolean animflag = false; boolean parsearch = false; boolean archmore = false; - String oldCath = "<xxx>"; - boolean isNewCathegory = true; + String oldCat = "<xxx>"; + boolean isNewCategory = true; int firstArch = -1; - String newCath = "no cathegory info"; + String newCat = "no category info"; int archmoreCount = 0; while (thisLine2 != null) { final String thisLine = thisLine2.trim(); @@ -314,13 +314,13 @@ mainControl.addArchPanelArch(mainControl.getArchCount(), index); } else { // loading from collected files, so we need process panels here - if (isNewCathegory) { - String folder = newCath; // main folder of new cath - if (newCath.indexOf("/") > 0) { - folder = newCath.substring(0, newCath.indexOf("/")); + if (isNewCategory) { + String folder = newCat; // main folder of new category + if (newCat.indexOf("/") > 0) { + folder = newCat.substring(0, newCat.indexOf("/")); } - if (!oldCath.startsWith(folder)) { + if (!oldCat.startsWith(folder)) { // an entire new panel must be opened mainControl.addArchPanel(folder); mainControl.addArchPanelCombo("show all"); @@ -328,11 +328,11 @@ index = 1; } - if (newCath.indexOf("/") > 0) { - folder = newCath.substring(newCath.indexOf("/") + 1); - if (newCath.startsWith(folder)) { + if (newCat.indexOf("/") > 0) { + folder = newCat.substring(newCat.indexOf("/") + 1); + if (newCat.startsWith(folder)) { index = 1; // add to the base folder - } else if (!oldCath.endsWith(folder)) { + } else if (!oldCat.endsWith(folder)) { // a new JComboBox must be added index = mainControl.addArchPanelCombo(folder); } @@ -340,8 +340,8 @@ index = 1; // add to the base folder } - isNewCathegory = false; - oldCath = newCath; + isNewCategory = false; + oldCat = newCat; } mainControl.addArchPanelArch(mainControl.getArchCount(), index); } @@ -423,10 +423,10 @@ arch.setFaceFlag(false); // we HAVE a face arch.setFaceName(thisLine.substring(x, thisLine.length())); } else if (thisLine.startsWith("editor_folder ")) { - // the display cathegory (= "folder" the arch belongs to) - newCath = thisLine.substring(14).trim(); - if (!newCath.equals(oldCath)) { - isNewCathegory = true; // this arch has a new cathegory + // the display category (= "folder" the arch belongs to) + newCat = thisLine.substring(14).trim(); + if (!newCat.equals(oldCat)) { + isNewCategory = true; // this arch has a new category } } else if (IGUIConstants.isoView && thisLine.startsWith("mpart_id ")) { // shape ID for multiparts Modified: trunk/crossfire/src/cfeditor/arch/ArchObjectStack.java =================================================================== --- trunk/crossfire/src/cfeditor/arch/ArchObjectStack.java 2006-07-05 22:05:43 UTC (rev 234) +++ trunk/crossfire/src/cfeditor/arch/ArchObjectStack.java 2006-07-07 08:29:34 UTC (rev 235) @@ -629,7 +629,7 @@ /** * Collect the existing arches and create archive-files for editor use as * well as the Crossfire server. The arches also get a special path - * variable included which is used in the editor to cathegorize the arches. + * variable included which is used in the editor to categorize the arches. * <p/> Output is: "archetypes", "crossfire.png" */ private void collectCFArches() { @@ -661,13 +661,13 @@ int count = 0; // count how much arches we've collected // loop through all existing ArchPanels and find all arches - // along with their display-cathegory + // along with their display-category ArchObject arch; for (CArchPanel.PanelNode node = CArchPanel.getStartPanelNode(); node != null; node = node.next) { final int[] numList = node.data.getListNodeNrArray(); // list of nodenumbers - final String[] cathList = node.data.getListCathegoryArray(); // list of cath. strings + final String[] catList = node.data.getListCategoryArray(); // list of category strings int multiparts = 0; @@ -692,8 +692,8 @@ binFile.writeBytes("type " + arch.getArchTypNr() + "\n"); } - // special: add a string-attribute with the display-cathegory - binFile.writeBytes("editor_folder " + node.getTitle() + "/" + cathList[i] + "\n"); + // special: add a string-attribute with the display-category + binFile.writeBytes("editor_folder " + node.getTitle() + "/" + catList[i] + "\n"); // add message text if (arch.getMsgText() != null && arch.getMsgText().trim().length() > 0) { @@ -741,8 +741,8 @@ binFile.writeBytes("type " + arch.getArchTypNr() + "\n"); } - // special: add a string-attribute with the display-cathegory - //binFile.writeBytes("editor_folder "+node.getTitle()+"/"+cathList[i]+"\n"); + // special: add a string-attribute with the display-category + //binFile.writeBytes("editor_folder "+node.getTitle()+"/"+catList[i]+"\n"); binFile.writeBytes(arch.getArchText()); if (arch.getArchText().lastIndexOf(0x0a) != arch.getArchText().length() - 1) { Modified: trunk/daimonin/src/daieditor/CArchPanelPan.java =================================================================== --- trunk/daimonin/src/daieditor/CArchPanelPan.java 2006-07-05 22:05:43 UTC (rev 234) +++ trunk/daimonin/src/daieditor/CArchPanelPan.java 2006-07-07 08:29:34 UTC (rev 235) @@ -203,23 +203,23 @@ /** * this is only needed when arche collection is run, so we want - * to know to which cathegorys the arches belong to: - * @return an array of the cathegorys of all arches in this panel<br> + * to know to which categories the arches belong to: + * @return an array of the categories of all arches in this panel<br> * note that the same indices are used for same arches in 'getListNodeNrArray()' */ - public String[] getListCathegoryArray() { - final String[] cathList = new String[archList.size()]; + public String[] getListCategoryArray() { + final String[] catList = new String[archList.size()]; int i = 0; for (final PanelEntry p : archList) { try { final int index = p.getIndex(); - cathList[i++] = jbox.getItemAt(index).toString().trim(); + catList[i++] = jbox.getItemAt(index).toString().trim(); } catch (final NullPointerException e) { - System.err.println("Nullpointer in getListCathegoryArray()!"); + System.err.println("Nullpointer in getListCategoryArray()!"); } } - return cathList; + return catList; } void showArchList() { Modified: trunk/daimonin/src/daieditor/arch/ArchObjectStack.java =================================================================== --- trunk/daimonin/src/daieditor/arch/ArchObjectStack.java 2006-07-05 22:05:43 UTC (rev 234) +++ trunk/daimonin/src/daieditor/arch/ArchObjectStack.java 2006-07-07 08:29:34 UTC (rev 235) @@ -527,7 +527,7 @@ /** * Collect the existing arches and create archive-files for editor use as * well as the Daimonin server. The arches also get a special path variable - * included which is used in the editor to cathegorize the arches. + * included which is used in the editor to categorize the arches. * <p/> * Output is: "archetypes", "daimonin.0", "animations", "bmaps" */ @@ -634,7 +634,7 @@ out.append("endmsg\n"); } - // special: add a string-attribute with the display-cathegory + // special: add a string-attribute with the display-category out.append("editor_folder ").append(arch.getEditorFolder()).append('\n'); out.append(arch.getArchText()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
