New Feature: Added owned column to industry jobs/market orders/contracts

GoldenGnu · Oct 3, 2023 · c8e3e31 · c8e3e31
1 parent 5623358
commit c8e3e31
Show file tree

Hide file tree

Showing 13 changed files with 105 additions and 6 deletions.
diff --git a/src/main/java/net/nikr/eve/jeveasset/data/api/my/MyContract.java b/src/main/java/net/nikr/eve/jeveasset/data/api/my/MyContract.java
@@ -42,16 +42,18 @@ public class MyContract extends RawContract implements LocationsType, OwnersType
 	private String issuer = "";
 	private final Set<Long> owners = new HashSet<>();
 	private boolean esi = true;
+	private boolean owned;
 
 	private boolean issuerAfterAssets = false;
 	private boolean acceptorAfterAssets = false;
 
 	public MyContract(RawContract rawContract) {
 		super(rawContract);
-		owners.add(getIssuerID());
-		owners.add(getIssuerCorpID());
-		owners.add(getAssigneeID());
-		owners.add(getAcceptorID());
+		this.owners.add(getIssuerID());
+		this.owners.add(getIssuerCorpID());
+		this.owners.add(getAssigneeID());
+		this.owners.add(getAcceptorID());
+		this.owned = !rawContract.isForCorp();
 	}
 
 	public String getTypeName() {
@@ -204,6 +206,14 @@ public boolean isExpired() {
 		return Settings.getNow().after(getDateExpired());
 	}
 
+	public boolean isOwned() {
+		return owned;
+	}
+
+	public void setOwned(boolean owned) {
+		this.owned = owned;
+	}
+
 	public String getStatusFormatted() {
 		return getStatusName(super.getStatus(), isExpired());
 	}

diff --git a/src/main/java/net/nikr/eve/jeveasset/data/api/my/MyIndustryJob.java b/src/main/java/net/nikr/eve/jeveasset/data/api/my/MyIndustryJob.java
@@ -205,14 +205,16 @@ public String getDescriptionOf(final MyIndustryJob job) {
 	private String completedCharacter = "";
 	private MyBlueprint blueprint;
 	private MyLocation location;
+	private boolean owned;
 
 	public MyIndustryJob(final RawIndustryJob rawIndustryJob, final Item item, final Item output, final OwnerType owner) {
 		super(rawIndustryJob);
 		this.item = item;
 		this.output = output;
 		this.owner = owner;
-		owners.add(getInstallerID());
-		owners.add(owner.getOwnerID());
+		this.owners.add(getInstallerID());
+		this.owners.add(owner.getOwnerID());
+		this.owned = owner.isCharacter();
 
 		switch (getActivityID()) {
 			case 0:
@@ -392,6 +394,14 @@ public final boolean isInvention() {
 		return getActivity() == IndustryActivity.ACTIVITY_REVERSE_INVENTION;
 	}
 
+	public boolean isOwned() {
+		return owned;
+	}
+
+	public void setOwned(boolean owned) {
+		this.owned = owned;
+	}
+
 	public IndustryActivity getActivity() {
 		return activity;
 	}

diff --git a/src/main/java/net/nikr/eve/jeveasset/data/api/my/MyMarketOrder.java b/src/main/java/net/nikr/eve/jeveasset/data/api/my/MyMarketOrder.java
@@ -62,6 +62,7 @@ public class MyMarketOrder extends RawMarketOrder implements Comparable<MyMarket
 	private Outbid outbid;
 	private boolean outbidOwned = false;
 	private boolean esi = true;
+	private boolean owned;
 	//soft init
 	private JButton jButton;
 
@@ -70,6 +71,7 @@ public MyMarketOrder(final RawMarketOrder rawMarketOrder, final Item item, final
 		this.item = item;
 		this.owner = owner;
 		this.owners = Collections.singleton(owner.getOwnerID());
+		this.owned = !rawMarketOrder.isCorp();
 	}
 
 	public void close() {
@@ -123,6 +125,14 @@ public boolean isActive() {
 		return getState() == MarketOrderState.OPEN && !isExpired();
 	}
 
+	public boolean isOwned() {
+		return owned;
+	}
+
+	public void setOwned(boolean owned) {
+		this.owned = owned;
+	}
+
 	@Override
 	public boolean isBPC() {
 		return false; //Market Orders are always BPO

diff --git a/src/main/java/net/nikr/eve/jeveasset/data/profile/ProfileData.java b/src/main/java/net/nikr/eve/jeveasset/data/profile/ProfileData.java
@@ -573,6 +573,11 @@ public synchronized void updateEventLists(Date addedDate) {
 			order.setIssuedByName(ApiIdConverter.getOwnerName(order.getIssuedBy()));
 			order.setBrokersFee(marketOrdersBrokersFee.get(order.getOrderID()));
 			order.setOutbid(Settings.get().getMarketOrdersOutbid().get(order.getOrderID()));
+			//Update Owned
+			Integer issuedBy = order.getIssuedBy();
+			if (order.isCorporation() && issuedBy != null) {
+				order.setOwned(uniqueOwners.containsKey((long) issuedBy));
+			}
 			//Price Data
 			order.setPriceData(ApiIdConverter.getPriceData(order.getTypeID(), false));
 			//Changed date
@@ -595,6 +600,10 @@ public synchronized void updateEventLists(Date addedDate) {
 			//Update Owners
 			industryJob.setInstaller(ApiIdConverter.getOwnerName(industryJob.getInstallerID()));
 			industryJob.setCompletedCharacter(ApiIdConverter.getOwnerName(industryJob.getCompletedCharacterID()));
+			//Update Owned
+			if (industryJob.getOwner().isCorporation()) {
+				industryJob.setOwned(uniqueOwners.containsKey(industryJob.getInstallerID()));
+			}
 			//Update BPO/BPC status
 			industryJob.setBlueprint(blueprints.get(industryJob.getBlueprintID()));
 			//Price
@@ -614,6 +623,10 @@ public synchronized void updateEventLists(Date addedDate) {
 			if (acceptor != null) {
 				contract.setAcceptorAfterAssets(acceptor.getAssetLastUpdate());
 			}
+			//Update Owned
+			if (contract.isForCorp()) {
+				contract.setOwned(uniqueOwners.containsKey(contract.getIssuerID()));
+			}
 			//Update Locations
 			contract.setStartLocation(ApiIdConverter.getLocation(contract.getStartLocationID()));
 			contract.setEndLocation(ApiIdConverter.getLocation(contract.getEndLocationID()));

diff --git a/src/main/java/net/nikr/eve/jeveasset/gui/tabs/contracts/ContractsTableFormat.java b/src/main/java/net/nikr/eve/jeveasset/gui/tabs/contracts/ContractsTableFormat.java
@@ -355,6 +355,20 @@ public Object getColumnValue(final MyContractItem from) {
 			return from.getContract().getAcceptor();
 		}
 	},
+	OWNED(YesNo.class, GlazedLists.comparableComparator(), true) {
+		@Override
+		public String getColumnName() {
+			return TabsContracts.get().columnOwned();
+		}
+		@Override
+		public String getColumnToolTip() {
+			return TabsContracts.get().columnOwnedToolTip();
+		}
+		@Override
+		public Object getColumnValue(final MyContractItem from) {
+			return new YesNo(from.getContract().isOwned());
+		}
+	},
 	START_STATION(String.class, GlazedLists.comparableComparator(), true) {
 		@Override
 		public String getColumnName() {

diff --git a/src/main/java/net/nikr/eve/jeveasset/gui/tabs/jobs/IndustryJobTableFormat.java b/src/main/java/net/nikr/eve/jeveasset/gui/tabs/jobs/IndustryJobTableFormat.java
@@ -26,6 +26,7 @@
 import java.util.Date;
 import net.nikr.eve.jeveasset.data.api.my.MyIndustryJob;
 import net.nikr.eve.jeveasset.gui.shared.table.EnumTableColumn;
+import net.nikr.eve.jeveasset.gui.shared.table.containers.YesNo;
 import net.nikr.eve.jeveasset.i18n.TabsJobs;
 
 
@@ -80,6 +81,20 @@ public Object getColumnValue(final MyIndustryJob from) {
 			return from.getInstaller();
 		}
 	},
+	OWNED(YesNo.class, GlazedLists.comparableComparator()) {
+		@Override
+		public String getColumnName() {
+			return TabsJobs.get().columnOwned();
+		}
+		@Override
+		public String getColumnToolTip() {
+			return TabsJobs.get().columnOwnedToolTip();
+		}
+		@Override
+		public Object getColumnValue(final MyIndustryJob from) {
+			return new YesNo(from.isOwned());
+		}
+	},
 	COMPLETED_CHARACTER(String.class, GlazedLists.comparableComparator()) {
 		@Override
 		public String getColumnName() {

diff --git a/src/main/java/net/nikr/eve/jeveasset/gui/tabs/orders/MarketTableFormat.java b/src/main/java/net/nikr/eve/jeveasset/gui/tabs/orders/MarketTableFormat.java
@@ -29,6 +29,7 @@
 import net.nikr.eve.jeveasset.gui.shared.table.EnumTableColumn;
 import net.nikr.eve.jeveasset.gui.shared.table.containers.LongInt;
 import net.nikr.eve.jeveasset.gui.shared.table.containers.Percent;
+import net.nikr.eve.jeveasset.gui.shared.table.containers.YesNo;
 import net.nikr.eve.jeveasset.i18n.TabsOrders;
 
 
@@ -312,6 +313,20 @@ public Object getColumnValue(final MyMarketOrder from) {
 			return from.getIssuedByName();
 		}
 	},
+	OWNED(YesNo.class, GlazedLists.comparableComparator()) {
+		@Override
+		public String getColumnName() {
+			return TabsOrders.get().columnOwned();
+		}
+		@Override
+		public String getColumnToolTip() {
+			return TabsOrders.get().columnOwnedToolTip();
+		}
+		@Override
+		public Object getColumnValue(final MyMarketOrder from) {
+			return new YesNo(from.isOwned());
+		}
+	},
 	WalletDivision(Integer.class, GlazedLists.comparableComparator()) {
 		@Override
 		public String getColumnName() {

diff --git a/src/main/java/net/nikr/eve/jeveasset/i18n/TabsContracts.java b/src/main/java/net/nikr/eve/jeveasset/i18n/TabsContracts.java
@@ -74,6 +74,8 @@ public TabsContracts(final Locale locale) {
 	public abstract String columnMaterialEfficiencyToolTip();
 	public abstract String columnName();
 	public abstract String columnNumDays();
+	public abstract String columnOwned();
+	public abstract String columnOwnedToolTip();
 	public abstract String columnPrice();
 	public abstract String columnQuantity();
 	public abstract String columnRecordID();

diff --git a/src/main/java/net/nikr/eve/jeveasset/i18n/TabsJobs.java b/src/main/java/net/nikr/eve/jeveasset/i18n/TabsJobs.java
@@ -50,6 +50,8 @@ public TabsJobs(final Locale locale) {
 	public abstract String columnName();
 	public abstract String columnOwner();
 	public abstract String columnInstaller();
+	public abstract String columnOwned();
+	public abstract String columnOwnedToolTip();
 	public abstract String columnCompletedCharacter();
 	public abstract String columnLocation();
 	public abstract String columnSystem();

diff --git a/src/main/java/net/nikr/eve/jeveasset/i18n/TabsOrders.java b/src/main/java/net/nikr/eve/jeveasset/i18n/TabsOrders.java
@@ -72,6 +72,8 @@ public TabsOrders(final Locale locale) {
 	public abstract String columnMinimumQuantity();
 	public abstract String columnOwner();
 	public abstract String columnIssuedBy();
+	public abstract String columnOwned();
+	public abstract String columnOwnedToolTip();
 	public abstract String columnWalletDivision();
 	public abstract String columnLocation();
 	public abstract String columnSystem();

diff --git a/src/main/resources/net/nikr/eve/jeveasset/i18n/TabsContracts.properties b/src/main/resources/net/nikr/eve/jeveasset/i18n/TabsContracts.properties
@@ -37,6 +37,8 @@ columnMaterialEfficiency=ME
 columnMaterialEfficiencyToolTip=Blueprint Material Efficiency
 columnName=Name
 columnNumDays=Num Days
+columnOwned=Owned
+columnOwnedToolTip=Owned by a shown character account
 columnPrice=Price
 columnQuantity=Quantity
 columnRecordID=Record ID

diff --git a/src/main/resources/net/nikr/eve/jeveasset/i18n/TabsJobs.properties b/src/main/resources/net/nikr/eve/jeveasset/i18n/TabsJobs.properties
@@ -14,6 +14,8 @@ columnActivity=Activity
 columnName=Name
 columnOwner=Owner
 columnInstaller=Installer
+columnOwned=Owned
+columnOwnedToolTip=Owned by a shown character account
 columnCompletedCharacter=Completed By
 columnLocation=Location
 columnSystem=System

diff --git a/src/main/resources/net/nikr/eve/jeveasset/i18n/TabsOrders.properties b/src/main/resources/net/nikr/eve/jeveasset/i18n/TabsOrders.properties
@@ -38,6 +38,8 @@ columnStatus=Status
 columnMinimumQuantity=Minimum Quantity
 columnOwner=Owner
 columnIssuedBy=Issued By
+columnOwned=Owned
+columnOwnedToolTip=Owned by a shown character account
 columnWalletDivision=Wallet Division
 columnLocation=Location
 columnSystem=System