X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTDirectoryTreeItem.java;h=0066e49356c3806c1af8f68a59c419001e631a39;hb=e16dda65585466c8987bd1efd718431450a96605;hp=0d02232e952afe4761a84cfac57fe38decd7b41d;hpb=daa4106c096cd4d2b92c3cbae6491edccd25fcc4;p=nikiroo-utils.git diff --git a/src/jexer/TDirectoryTreeItem.java b/src/jexer/TDirectoryTreeItem.java index 0d02232..0066e49 100644 --- a/src/jexer/TDirectoryTreeItem.java +++ b/src/jexer/TDirectoryTreeItem.java @@ -1,29 +1,27 @@ /* * Jexer - Java Text User Interface * - * License: LGPLv3 or later + * The MIT License (MIT) * - * This module is licensed under the GNU Lesser General Public License - * Version 3. Please see the file "COPYING" in this directory for more - * information about the GNU Lesser General Public License Version 3. + * Copyright (C) 2016 Kevin Lamonte * - * Copyright (C) 2015 Kevin Lamonte + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 3 of - * the License, or (at your option) any later version. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this program; if not, see - * http://www.gnu.org/licenses/, or write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * * @author Kevin Lamonte [kevin.lamonte@gmail.com] * @version 1 @@ -60,7 +58,7 @@ public class TDirectoryTreeItem extends TTreeItem { * true if this item was just expanded from a mouse click or keypress. */ @Override - public void onExpand() { + public final void onExpand() { // System.err.printf("onExpand() %s\n", file); if (file == null) { @@ -77,7 +75,7 @@ public class TDirectoryTreeItem extends TTreeItem { assert (file.isDirectory()); setExpandable(true); - if ((isExpanded() == false) || (isExpandable() == false)) { + if (!isExpanded() || !isExpandable()) { getTreeView().reflow(); return; } @@ -118,7 +116,9 @@ public class TDirectoryTreeItem extends TTreeItem { * @throws IllegalArgumentException if this function is called */ @Override - public final TTreeItem addChild(final String text, final boolean expanded) { + public final TTreeItem addChild(final String text, + final boolean expanded) throws IllegalArgumentException { + throw new IllegalArgumentException("Do not call addChild(), use onExpand() instead"); } @@ -127,6 +127,7 @@ public class TDirectoryTreeItem extends TTreeItem { * * @param view root TTreeView * @param text text for this item + * @throws IOException if a java.io operation throws */ public TDirectoryTreeItem(final TTreeView view, final String text) throws IOException { @@ -140,6 +141,7 @@ public class TDirectoryTreeItem extends TTreeItem { * @param view root TTreeView * @param text text for this item * @param expanded if true, have it expanded immediately + * @throws IOException if a java.io operation throws */ public TDirectoryTreeItem(final TTreeView view, final String text, final boolean expanded) throws IOException { @@ -155,6 +157,7 @@ public class TDirectoryTreeItem extends TTreeItem { * @param expanded if true, have it expanded immediately * @param openParents if true, expand all paths up the root path and * return the root path entry + * @throws IOException if a java.io operation throws */ public TDirectoryTreeItem(final TTreeView view, final String text, final boolean expanded, final boolean openParents) throws IOException { @@ -168,7 +171,7 @@ public class TDirectoryTreeItem extends TTreeItem { File rootFile = new File(text); rootFile = rootFile.getCanonicalFile(); - if (openParents == true) { + if (openParents) { setExpanded(true); // Go up the directory tree @@ -186,12 +189,12 @@ public class TDirectoryTreeItem extends TTreeItem { } else { // This is a relative path. We got here because openParents was // false. - assert (openParents == false); + assert (!openParents); setText(rootFile.getName()); } onExpand(); - if (openParents == true) { + if (openParents) { TDirectoryTreeItem childFile = this; Collections.reverse(parentFiles); for (String p: parentFiles) {