Skip to content

Commit e88fbb0

Browse files
HammerGSHammerGS
authored
Merge pull request #7254 from IllianiBird/factionStandingPackageReorganize
Improvement: Reorganized Faction Standing Packages
2 parents 7038577 + c5a2fbc commit e88fbb0

20 files changed

+75
-69
lines changed

MekHQ/src/mekhq/campaign/universe/factionStanding/enums/FactionStandingLevel.java renamed to MekHQ/src/mekhq/campaign/universe/factionStanding/FactionStandingLevel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* <https://www.xbox.com/en-US/developers/rules> and it is not endorsed by or
3131
* affiliated with Microsoft.
3232
*/
33-
package mekhq.campaign.universe.factionStanding.enums;
33+
package mekhq.campaign.universe.factionStanding;
3434

3535
import static java.lang.Math.round;
3636
import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
@@ -44,7 +44,7 @@
4444
import megamek.logging.MMLogger;
4545
import mekhq.campaign.CampaignOptions;
4646
import mekhq.campaign.universe.Faction;
47-
import mekhq.gui.dialog.reportDialogs.FactionStanding.FactionStandingReport;
47+
import mekhq.gui.dialog.factionStanding.FactionStandingReport;
4848

4949
/**
5050
* Represents a standing level within the Faction Standing reputation system.

‎MekHQ/src/mekhq/campaign/universe/factionStanding/FactionStandingUtilities.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
package mekhq.campaign.universe.factionStanding;
3434

3535
import megamek.logging.MMLogger;
36-
import mekhq.campaign.universe.factionStanding.enums.FactionStandingLevel;
3736

3837

3938
public class FactionStandingUtilities {

‎MekHQ/src/mekhq/campaign/universe/factionStanding/FactionStandings.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
package mekhq.campaign.universe.factionStanding;
3434

3535
import static megamek.codeUtilities.MathUtility.clamp;
36-
import static mekhq.gui.dialog.reportDialogs.FactionStanding.manualMissionDialogs.SimulateMissionDialog.handleFactionRegardUpdates;
36+
import static mekhq.gui.dialog.factionStanding.manualMissionDialogs.SimulateMissionDialog.handleFactionRegardUpdates;
3737
import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
3838
import static mekhq.utilities.MHQInternationalization.getTextAt;
3939
import static mekhq.utilities.ReportingUtilities.CLOSING_SPAN_TAG;
@@ -65,8 +65,7 @@
6565
import mekhq.campaign.universe.Faction;
6666
import mekhq.campaign.universe.FactionHints;
6767
import mekhq.campaign.universe.Factions;
68-
import mekhq.campaign.universe.factionStanding.enums.FactionStandingLevel;
69-
import mekhq.gui.dialog.reportDialogs.FactionStanding.manualMissionDialogs.ManualMissionDialog;
68+
import mekhq.gui.dialog.factionStanding.manualMissionDialogs.ManualMissionDialog;
7069
import mekhq.utilities.MHQXMLUtility;
7170
import org.w3c.dom.Node;
7271
import org.w3c.dom.NodeList;

‎MekHQ/src/mekhq/campaign/universe/factionStanding/PerformBatchall.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,21 +32,20 @@
3232
*/
3333
package mekhq.campaign.universe.factionStanding;
3434

35+
import static megamek.common.Compute.randomInt;
36+
import static mekhq.campaign.Campaign.AdministratorSpecialization.COMMAND;
37+
import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
38+
import static mekhq.utilities.MHQInternationalization.getTextAt;
39+
40+
import java.util.ArrayList;
41+
import java.util.List;
42+
3543
import mekhq.campaign.Campaign;
3644
import mekhq.campaign.personnel.Person;
3745
import mekhq.campaign.universe.Faction;
3846
import mekhq.campaign.universe.Factions;
39-
import mekhq.campaign.universe.factionStanding.enums.FactionStandingLevel;
4047
import mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogSimple;
4148

42-
import java.util.ArrayList;
43-
import java.util.List;
44-
45-
import static megamek.common.Compute.randomInt;
46-
import static mekhq.campaign.Campaign.AdministratorSpecialization.COMMAND;
47-
import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
48-
import static mekhq.utilities.MHQInternationalization.getTextAt;
49-
5049
/**
5150
* Handles the process of issuing Batchalls to the player when facing a Clan opponent.
5251
*

‎MekHQ/src/mekhq/gui/BriefingTab.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
import static mekhq.campaign.mission.enums.MissionStatus.SUCCESS;
3939
import static mekhq.campaign.mission.enums.ScenarioStatus.REFUSED_ENGAGEMENT;
4040
import static mekhq.campaign.randomEvents.prisoners.PrisonerEventManager.DEFAULT_TEMPORARY_CAPACITY;
41-
import static mekhq.gui.dialog.reportDialogs.FactionStanding.manualMissionDialogs.SimulateMissionDialog.handleFactionRegardUpdates;
41+
import static mekhq.gui.dialog.factionStanding.manualMissionDialogs.SimulateMissionDialog.handleFactionRegardUpdates;
4242
import static mekhq.utilities.MHQInternationalization.getText;
4343

4444
import java.awt.BorderLayout;
@@ -120,8 +120,8 @@
120120
import mekhq.gui.dialog.NewAtBContractDialog;
121121
import mekhq.gui.dialog.NewContractDialog;
122122
import mekhq.gui.dialog.RetirementDefectionDialog;
123-
import mekhq.gui.dialog.reportDialogs.FactionStanding.manualMissionDialogs.ManualMissionDialog;
124-
import mekhq.gui.dialog.reportDialogs.FactionStanding.manualMissionDialogs.SimulateMissionDialog;
123+
import mekhq.gui.dialog.factionStanding.manualMissionDialogs.ManualMissionDialog;
124+
import mekhq.gui.dialog.factionStanding.manualMissionDialogs.SimulateMissionDialog;
125125
import mekhq.gui.enums.MHQTabType;
126126
import mekhq.gui.model.ScenarioTableModel;
127127
import mekhq.gui.panels.TutorialHyperlinkPanel;

‎MekHQ/src/mekhq/gui/CommandCenterTab.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
import mekhq.gui.baseComponents.roundedComponents.RoundedLineBorder;
7676
import mekhq.gui.dialog.AcquisitionsDialog;
7777
import mekhq.gui.dialog.PartsReportDialog;
78+
import mekhq.gui.dialog.factionStanding.FactionStandingReport;
7879
import mekhq.gui.dialog.reportDialogs.CargoReportDialog;
79-
import mekhq.gui.dialog.reportDialogs.FactionStanding.FactionStandingReport;
8080
import mekhq.gui.dialog.reportDialogs.HangarReportDialog;
8181
import mekhq.gui.dialog.reportDialogs.PersonnelReportDialog;
8282
import mekhq.gui.dialog.reportDialogs.ReputationReportDialog;

‎MekHQ/src/mekhq/gui/campaignOptions/CampaignOptionsPane.java‎

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,32 @@
3232
*/
3333
package mekhq.gui.campaignOptions;
3434

35+
import static java.lang.Math.round;
36+
import static mekhq.campaign.force.CombatTeam.recalculateCombatTeams;
37+
import static mekhq.campaign.personnel.skills.enums.SkillSubType.COMBAT_GUNNERY;
38+
import static mekhq.campaign.personnel.skills.enums.SkillSubType.COMBAT_PILOTING;
39+
import static mekhq.campaign.personnel.skills.enums.SkillSubType.ROLEPLAY_GENERAL;
40+
import static mekhq.campaign.personnel.skills.enums.SkillSubType.SUPPORT;
41+
import static mekhq.gui.campaignOptions.CampaignOptionsDialog.CampaignOptionsDialogMode.ABRIDGED;
42+
import static mekhq.gui.campaignOptions.CampaignOptionsDialog.CampaignOptionsDialogMode.STARTUP_ABRIDGED;
43+
import static mekhq.gui.campaignOptions.CampaignOptionsUtilities.createSubTabs;
44+
import static mekhq.gui.campaignOptions.CampaignOptionsUtilities.getCampaignOptionsResourceBundle;
45+
import static mekhq.utilities.MHQInternationalization.getTextAt;
46+
import static mekhq.utilities.spaUtilities.enums.AbilityCategory.CHARACTER_CREATION_ONLY;
47+
import static mekhq.utilities.spaUtilities.enums.AbilityCategory.CHARACTER_FLAW;
48+
import static mekhq.utilities.spaUtilities.enums.AbilityCategory.COMBAT_ABILITY;
49+
import static mekhq.utilities.spaUtilities.enums.AbilityCategory.MANEUVERING_ABILITY;
50+
import static mekhq.utilities.spaUtilities.enums.AbilityCategory.UTILITY_ABILITY;
51+
52+
import java.time.LocalDate;
53+
import java.util.List;
54+
import java.util.Map;
55+
import java.util.ResourceBundle;
56+
import javax.swing.JFrame;
57+
import javax.swing.JPanel;
58+
import javax.swing.JScrollPane;
59+
import javax.swing.JTabbedPane;
60+
3561
import megamek.common.annotations.Nullable;
3662
import mekhq.CampaignPreset;
3763
import mekhq.MekHQ;
@@ -46,26 +72,7 @@
4672
import mekhq.gui.baseComponents.AbstractMHQTabbedPane;
4773
import mekhq.gui.campaignOptions.CampaignOptionsDialog.CampaignOptionsDialogMode;
4874
import mekhq.gui.campaignOptions.contents.*;
49-
import mekhq.gui.dialog.reportDialogs.FactionStanding.CampaignOptionsChangedConfirmationDialog;
50-
51-
import javax.swing.JFrame;
52-
import javax.swing.JPanel;
53-
import javax.swing.JScrollPane;
54-
import javax.swing.JTabbedPane;
55-
import java.time.LocalDate;
56-
import java.util.List;
57-
import java.util.Map;
58-
import java.util.ResourceBundle;
59-
60-
import static java.lang.Math.round;
61-
import static mekhq.campaign.force.CombatTeam.recalculateCombatTeams;
62-
import static mekhq.campaign.personnel.skills.enums.SkillSubType.*;
63-
import static mekhq.gui.campaignOptions.CampaignOptionsDialog.CampaignOptionsDialogMode.ABRIDGED;
64-
import static mekhq.gui.campaignOptions.CampaignOptionsDialog.CampaignOptionsDialogMode.STARTUP_ABRIDGED;
65-
import static mekhq.gui.campaignOptions.CampaignOptionsUtilities.createSubTabs;
66-
import static mekhq.gui.campaignOptions.CampaignOptionsUtilities.getCampaignOptionsResourceBundle;
67-
import static mekhq.utilities.MHQInternationalization.getTextAt;
68-
import static mekhq.utilities.spaUtilities.enums.AbilityCategory.*;
75+
import mekhq.gui.dialog.factionStanding.CampaignOptionsChangedConfirmationDialog;
6976

7077
/**
7178
* The {@code CampaignOptionsPane} class represents a tabbed pane used for displaying and managing various campaign

MekHQ/src/mekhq/gui/dialog/reportDialogs/FactionStanding/CampaignOptionsChangedConfirmationDialog.java renamed to MekHQ/src/mekhq/gui/dialog/factionStanding/CampaignOptionsChangedConfirmationDialog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* <https://www.xbox.com/en-US/developers/rules> and it is not endorsed by or
3131
* affiliated with Microsoft.
3232
*/
33-
package mekhq.gui.dialog.reportDialogs.FactionStanding;
33+
package mekhq.gui.dialog.factionStanding;
3434

3535
import static java.lang.Integer.MAX_VALUE;
3636
import static megamek.client.ui.util.FlatLafStyleBuilder.setFontScaling;

MekHQ/src/mekhq/gui/dialog/reportDialogs/FactionStanding/FactionStandingReport.java renamed to MekHQ/src/mekhq/gui/dialog/factionStanding/FactionStandingReport.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
* <https://www.xbox.com/en-US/developers/rules> and it is not endorsed by or
3131
* affiliated with Microsoft.
3232
*/
33-
package mekhq.gui.dialog.reportDialogs.FactionStanding;
33+
package mekhq.gui.dialog.factionStanding;
3434

3535
import static java.lang.Math.round;
3636
import static megamek.client.ui.util.FlatLafStyleBuilder.setFontScaling;
37-
import static mekhq.gui.dialog.reportDialogs.FactionStanding.manualMissionDialogs.SimulateMissionDialog.handleFactionRegardUpdates;
37+
import static mekhq.gui.dialog.factionStanding.manualMissionDialogs.SimulateMissionDialog.handleFactionRegardUpdates;
3838
import static mekhq.utilities.MHQInternationalization.getTextAt;
3939
import static mekhq.utilities.ReportingUtilities.CLOSING_SPAN_TAG;
4040
import static mekhq.utilities.ReportingUtilities.getAmazingColor;
@@ -72,15 +72,15 @@
7272
import mekhq.campaign.universe.Faction;
7373
import mekhq.campaign.universe.FactionHints;
7474
import mekhq.campaign.universe.Factions;
75+
import mekhq.campaign.universe.factionStanding.FactionStandingLevel;
7576
import mekhq.campaign.universe.factionStanding.FactionStandingUtilities;
7677
import mekhq.campaign.universe.factionStanding.FactionStandings;
77-
import mekhq.campaign.universe.factionStanding.enums.FactionStandingLevel;
7878
import mekhq.campaign.utilities.glossary.DocumentationEntry;
7979
import mekhq.gui.baseComponents.roundedComponents.RoundedJButton;
8080
import mekhq.gui.baseComponents.roundedComponents.RoundedLineBorder;
81+
import mekhq.gui.dialog.factionStanding.gmToolsDialog.GMTools;
82+
import mekhq.gui.dialog.factionStanding.manualMissionDialogs.SimulateMissionDialog;
8183
import mekhq.gui.dialog.glossary.NewDocumentationEntryDialog;
82-
import mekhq.gui.dialog.reportDialogs.FactionStanding.gmToolsDialog.GMTools;
83-
import mekhq.gui.dialog.reportDialogs.FactionStanding.manualMissionDialogs.SimulateMissionDialog;
8484
import mekhq.gui.utilities.JScrollPaneWithSpeed;
8585
import mekhq.gui.utilities.WrapLayout;
8686

MekHQ/src/mekhq/gui/dialog/reportDialogs/FactionStanding/FactionStandingSlider.java renamed to MekHQ/src/mekhq/gui/dialog/factionStanding/FactionStandingSlider.java

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,21 @@
3030
* <https://www.xbox.com/en-US/developers/rules> and it is not endorsed by or
3131
* affiliated with Microsoft.
3232
*/
33-
package mekhq.gui.dialog.reportDialogs.FactionStanding;
33+
package mekhq.gui.dialog.factionStanding;
3434

35-
import megamek.client.ui.util.UIUtil;
35+
import static mekhq.utilities.MHQInternationalization.getTextAt;
3636

37-
import javax.swing.*;
38-
import javax.swing.plaf.basic.BasicSliderUI;
39-
import java.awt.*;
37+
import java.awt.Color;
38+
import java.awt.Dimension;
39+
import java.awt.Graphics;
40+
import java.awt.Graphics2D;
41+
import java.awt.RenderingHints;
4042
import java.awt.geom.RoundRectangle2D;
43+
import javax.swing.JLabel;
44+
import javax.swing.JSlider;
45+
import javax.swing.plaf.basic.BasicSliderUI;
4146

42-
import static mekhq.utilities.MHQInternationalization.getTextAt;
47+
import megamek.client.ui.util.UIUtil;
4348

4449
/**
4550
* A custom {@link JSlider} used to visually represent faction standing levels with labeled "Regard" and "Climate" slider

0 commit comments

Comments
 (0)