From d4d1d7ff187261f71397fc53c8b672a7f29bd87b Mon Sep 17 00:00:00 2001 From: Shevchik Date: Fri, 7 Mar 2014 22:36:55 +0400 Subject: [PATCH] Remove empty message check, remove netbeans autogenerated comments --- .../cnaude/chairs/commands/ChairsCommand.java | 32 ++++--------------- .../chairs/commands/ChairsIgnoreList.java | 13 ++------ src/com/cnaude/chairs/core/ChairBlock.java | 9 +----- .../cnaude/chairs/sitaddons/ChairEffects.java | 8 ----- 4 files changed, 10 insertions(+), 52 deletions(-) diff --git a/src/com/cnaude/chairs/commands/ChairsCommand.java b/src/com/cnaude/chairs/commands/ChairsCommand.java index 66f355b..d2b1dbc 100644 --- a/src/com/cnaude/chairs/commands/ChairsCommand.java +++ b/src/com/cnaude/chairs/commands/ChairsCommand.java @@ -1,7 +1,3 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package com.cnaude.chairs.commands; import org.bukkit.command.Command; @@ -11,10 +7,6 @@ import org.bukkit.entity.Player; import com.cnaude.chairs.core.Chairs; -/** - * - * @author cnaude - */ public class ChairsCommand implements CommandExecutor { private final Chairs plugin; @@ -43,13 +35,9 @@ public class ChairsCommand implements CommandExecutor { } else { plugin.chairEffects.cancelPickup(); } - if (!plugin.msgReloaded.isEmpty()) { - sender.sendMessage(plugin.msgReloaded); - } + sender.sendMessage(plugin.msgReloaded); } else { - if (!plugin.msgNoPerm.isEmpty()) { - sender.sendMessage(plugin.msgNoPerm); - } + sender.sendMessage(plugin.msgNoPerm); } } if (sender instanceof Player) { @@ -57,25 +45,17 @@ public class ChairsCommand implements CommandExecutor { if (args[0].equalsIgnoreCase("on")) { if (p.hasPermission("chairs.self")) { ignoreList.removePlayer(p.getName()); - if (!plugin.msgEnabled.isEmpty()) { - p.sendMessage(plugin.msgEnabled); - } + p.sendMessage(plugin.msgEnabled); } else { - if (!plugin.msgNoPerm.isEmpty()) { - p.sendMessage(plugin.msgNoPerm); - } + p.sendMessage(plugin.msgNoPerm); } } if (args[0].equalsIgnoreCase("off")) { if (p.hasPermission("chairs.self")) { ignoreList.addPlayer(p.getName()); - if (!plugin.msgDisabled.isEmpty()) { - p.sendMessage(plugin.msgDisabled); - } + p.sendMessage(plugin.msgDisabled); } else { - if (!plugin.msgNoPerm.isEmpty()) { - p.sendMessage(plugin.msgNoPerm); - } + p.sendMessage(plugin.msgNoPerm); } } } diff --git a/src/com/cnaude/chairs/commands/ChairsIgnoreList.java b/src/com/cnaude/chairs/commands/ChairsIgnoreList.java index 89f3b81..0c2f3f7 100644 --- a/src/com/cnaude/chairs/commands/ChairsIgnoreList.java +++ b/src/com/cnaude/chairs/commands/ChairsIgnoreList.java @@ -1,7 +1,3 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package com.cnaude.chairs.commands; import java.io.File; @@ -14,14 +10,11 @@ import java.util.ArrayList; import com.cnaude.chairs.core.Chairs; -/** - * - * @author cnaude - */ @SuppressWarnings("serial") -public class ChairsIgnoreList implements Serializable{ +public class ChairsIgnoreList implements Serializable { + private static ArrayList ignoreList = new ArrayList(); - private static final String IGNORE_FILE = "plugins/Chairs/ignores.ser"; + private static final String IGNORE_FILE = "plugins"+File.separator+"Chairs"+File.separator+"ignores.ser"; private Chairs plugin; public ChairsIgnoreList(Chairs plugin) { diff --git a/src/com/cnaude/chairs/core/ChairBlock.java b/src/com/cnaude/chairs/core/ChairBlock.java index 4d514d5..2c90b57 100644 --- a/src/com/cnaude/chairs/core/ChairBlock.java +++ b/src/com/cnaude/chairs/core/ChairBlock.java @@ -1,16 +1,9 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package com.cnaude.chairs.core; import org.bukkit.Material; -/** - * - * @author cnaude - */ public class ChairBlock { + private Material mat; private double sitHeight; diff --git a/src/com/cnaude/chairs/sitaddons/ChairEffects.java b/src/com/cnaude/chairs/sitaddons/ChairEffects.java index 7b12132..1a39357 100644 --- a/src/com/cnaude/chairs/sitaddons/ChairEffects.java +++ b/src/com/cnaude/chairs/sitaddons/ChairEffects.java @@ -1,7 +1,3 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package com.cnaude.chairs.sitaddons; import org.bukkit.Bukkit; @@ -15,10 +11,6 @@ import org.bukkit.event.player.PlayerPickupItemEvent; import com.cnaude.chairs.core.Chairs; -/** - * - * @author cnaude - */ public class ChairEffects { private Chairs plugin;