Revision 41804 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.installer/org.gvsig.installer.swing/org.gvsig.installer.swing.impl/src/main/java/org/gvsig/installer/swing/impl/execution/panel/renderers/OsAndArchitectureCellRenderer.java

View differences:

OsAndArchitectureCellRenderer.java
60 60 
		if( InstallerManager.OS.ALL.equalsIgnoreCase(osArch.os) ) {
61 61 
			return check;
62 62 
		}
63
64 
                String oslabel = osArch.os;
63 65 
		if( InstallerManager.OS.LINUX.equalsIgnoreCase(osArch.os) ) {
64 
			if( InstallerManager.ARCH.X86.equalsIgnoreCase(osArch.arch) ) {
65 
				tooltip = "Linux 32 bits";
66 
			} else if( InstallerManager.ARCH.X86_64.equalsIgnoreCase(osArch.arch) ) {
67 
				tooltip = "Linux 64 bits";
68 
			} else {
69 
				tooltip = "Linux " + osArch;
70 
			}
66 
                    oslabel = "Linux";
71 67 
		} else if( InstallerManager.OS.WINDOWS.equalsIgnoreCase(osArch.os) ) {
72 
			if( InstallerManager.ARCH.X86.equalsIgnoreCase(osArch.arch) ) {
73 
				tooltip = "Windows 32 bits";
74 
			} else if( InstallerManager.ARCH.X86_64.equalsIgnoreCase(osArch.arch) ) {
75 
				tooltip = "Windows 64 bits";
76 
			} else {
77 
				tooltip = "Windows " + osArch;
78 
			}
79 
		} else {
80 
			if( InstallerManager.ARCH.X86.equalsIgnoreCase(osArch.arch) ) {
81 
				tooltip = osArch.os + " 32 bits";
82 
			} else if( InstallerManager.ARCH.X86_64.equalsIgnoreCase(osArch.arch) ) {
83 
				tooltip = osArch.os + " 64 bits";
84 
			} else {
85 
				tooltip = osArch.os + " " + osArch.arch;
86 
			}
68 
                    oslabel = "Windows";
87 69 
		}
88 
		try {
70
71 
                if( InstallerManager.ARCH.ALL.equalsIgnoreCase(osArch.arch) ) {
72 
                    tooltip = oslabel;
73 
                } else if( InstallerManager.ARCH.X86.equalsIgnoreCase(osArch.arch) ) {
74 
                    tooltip = oslabel + " 32 bits";
75 
                } else if( InstallerManager.ARCH.X86_64.equalsIgnoreCase(osArch.arch) ) {
76 
                    tooltip = oslabel + " 64 bits";
77 
                } else {
78 
                    tooltip = oslabel + " (" + osArch.arch +")";
79 
                }
80 

  		




  
  81
  
    
                try {


  		




  89
  82
  
    
			resource = this.getClass().getResource("/images/platform_14x14_"+osArch.os+"_"+osArch.arch+".png");


  		




  90
  83
  
    
		} catch( Exception ex) {


  		




  91
  84
  
    
			resource = null;


  		












Also available in:  Unified diff